@@ -104,6 +104,7 @@ Parameters::Parameters():
104
104
// gpu
105
105
PARAM_GPU(PARAM_GPU_ID, " --gpu" , " Use GPU" , " Use GPU (CUDA) if possible", typeid(int ), (void *) &gpu, "^[0-1]{1 }$" , MMseqsParameter::COMMAND_COMMON),
106
106
PARAM_GPU_SERVER(PARAM_GPU_SERVER_ID, " --gpu-server" , " Use GPU server" , " Use GPU server" , typeid(int), (void *) &gpuServer, " ^[0 -1 ]{1 }$" , MMseqsParameter::COMMAND_COMMON),
107
+ PARAM_GPU_SERVER_WAIT_TIMEOUT(PARAM_GPU_SERVER_WAIT_TIMEOUT_ID, " --gpu-server-wait-timeout" , " Wait for GPU server" , " Wait for GPU server for 0 : don' t wait -1: no wait limit: >0 this many seconds", typeid(int), (void *) &gpuServerWaitTimeout, "^-?[0-9]+", MMseqsParameter::COMMAND_COMMON),
107
108
// convertalignments
108
109
PARAM_FORMAT_MODE(PARAM_FORMAT_MODE_ID, "--format-mode", "Alignment format", "Output format:\n 0: BLAST-TAB\n 1: SAM\n 2: BLAST-TAB + query/db length\n 3: Pretty HTML\n 4: BLAST-TAB + column headers\n BLAST-TAB (0) and BLAST-TAB + column headers (4) support custom output formats (--format-output)", typeid(int), (void *) &formatAlignmentMode, "^[0-4]{1}$"),
109
110
PARAM_FORMAT_OUTPUT(PARAM_FORMAT_OUTPUT_ID, "--format-output", "Format alignment output", "Choose comma separated list of output columns from: query,target,evalue,gapopen,pident,fident,nident,qstart,qend,qlen\n tstart,tend,tlen,alnlen,raw,bits,cigar,qseq,tseq,qheader,theader,qaln,taln,qframe,tframe,mismatch,qcov,tcov\n qset,qsetid,tset,tsetid,taxid,taxname,taxlineage,qorfstart,qorfend,torfstart,torfend,ppos", typeid(std::string), (void *) &outfmt, ""),
@@ -455,6 +456,7 @@ Parameters::Parameters():
455
456
ungappedprefilter.push_back(&PARAM_PRELOAD_MODE);
456
457
ungappedprefilter.push_back(&PARAM_GPU);
457
458
ungappedprefilter.push_back(&PARAM_GPU_SERVER);
459
+ ungappedprefilter.push_back(&PARAM_GPU_SERVER_WAIT_TIMEOUT);
458
460
ungappedprefilter.push_back(&PARAM_PREF_MODE);
459
461
ungappedprefilter.push_back(&PARAM_THREADS);
460
462
ungappedprefilter.push_back(&PARAM_COMPRESSED);
@@ -1357,6 +1359,7 @@ Parameters::Parameters():
1357
1359
clusterworkflow = combineList(clusterworkflow, linclustworkflow);
1358
1360
clusterworkflow = removeParameter(clusterworkflow, PARAM_GPU);
1359
1361
clusterworkflow = removeParameter(clusterworkflow, PARAM_GPU_SERVER);
1362
+ clusterworkflow = removeParameter(clusterworkflow, PARAM_GPU_SERVER_WAIT_TIMEOUT);
1360
1363
1361
1364
// easyclusterworkflow
1362
1365
easyclusterworkflow = combineList(clusterworkflow, createdb);
@@ -1400,6 +1403,7 @@ Parameters::Parameters():
1400
1403
clusterUpdate.push_back(&PARAM_RECOVER_DELETED);
1401
1404
clusterUpdate = removeParameter(clusterUpdate, PARAM_GPU);
1402
1405
clusterUpdate = removeParameter(clusterUpdate, PARAM_GPU_SERVER);
1406
+ clusterUpdate = removeParameter(clusterUpdate, PARAM_GPU_SERVER_WAIT_TIMEOUT);
1403
1407
1404
1408
mapworkflow = combineList(prefilter, rescorediagonal);
1405
1409
mapworkflow = combineList(mapworkflow, extractorfs);
@@ -1410,6 +1414,7 @@ Parameters::Parameters():
1410
1414
mapworkflow.push_back(&PARAM_REMOVE_TMP_FILES);
1411
1415
mapworkflow = removeParameter(mapworkflow, PARAM_GPU);
1412
1416
mapworkflow = removeParameter(mapworkflow, PARAM_GPU_SERVER);
1417
+ mapworkflow = removeParameter(mapworkflow, PARAM_GPU_SERVER_WAIT_TIMEOUT);
1413
1418
1414
1419
enrichworkflow = combineList(searchworkflow, prefilter);
1415
1420
enrichworkflow = combineList(enrichworkflow, subtractdbs);
@@ -1418,6 +1423,7 @@ Parameters::Parameters():
1418
1423
enrichworkflow = combineList(enrichworkflow, result2profile);
1419
1424
enrichworkflow = removeParameter(enrichworkflow, PARAM_GPU);
1420
1425
enrichworkflow = removeParameter(enrichworkflow, PARAM_GPU_SERVER);
1426
+ enrichworkflow = removeParameter(enrichworkflow, PARAM_GPU_SERVER_WAIT_TIMEOUT);
1421
1427
1422
1428
databases.push_back(&PARAM_HELP);
1423
1429
databases.push_back(&PARAM_HELP_LONG);
@@ -2468,6 +2474,7 @@ void Parameters::setDefaults() {
2468
2474
}
2469
2475
#endif
2470
2476
gpuServer = 0 ;
2477
+ gpuServerWaitTimeout = 10 * 60 ;
2471
2478
#ifdef HAVE_CUDA
2472
2479
char * gpuServerEnv = getenv (" MMSEQS_FORCE_GPUSERVER" );
2473
2480
if (gpuServerEnv != NULL ) {
0 commit comments