Skip to content

Commit cd9257e

Browse files
committed
fix: revert base.config and fix micromono
1 parent 25fad41 commit cd9257e

File tree

2 files changed

+43
-20
lines changed

2 files changed

+43
-20
lines changed

conf/base.config

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,30 @@ process {
2929

3030
withLabel:process_single {
3131
cpus = { check_max( 1 , 'cpus' ) }
32-
memory = { check_max( 5.GB * task.attempt, 'memory' ) }
33-
time = { check_max( 10.h * task.attempt , 'time' ) }
32+
memory = { check_max( 500.MB * task.attempt, 'memory' ) }
33+
time = { check_max( 2.h * task.attempt , 'time' ) }
3434
}
3535
withLabel:process_low {
3636
cpus = { check_max( 1 * task.attempt, 'cpus' ) }
3737
memory = { check_max( 2.GB * task.attempt, 'memory' ) }
38-
time = { check_max( 40.h * task.attempt, 'time' ) }
38+
time = { check_max( 4.h * task.attempt, 'time' ) }
3939
}
4040
withLabel:process_medium {
41-
cpus = { check_max( 5 * task.attempt, 'cpus' ) }
41+
cpus = { check_max( 4 * task.attempt, 'cpus' ) }
4242
memory = { check_max( 20.GB * task.attempt, 'memory' ) }
4343
time = { check_max( 80.h * task.attempt, 'time' ) }
4444
}
4545
withLabel:process_high {
46-
cpus = { check_max( 24 * task.attempt, 'cpus' ) }
47-
memory = { check_max( 100.GB * task.attempt, 'memory' ) }
46+
cpus = { check_max( 16 * task.attempt, 'cpus' ) }
47+
memory = { check_max( 60.GB * task.attempt, 'memory' ) }
4848
time = { check_max( 16.h * task.attempt, 'time' ) }
4949
}
5050
withLabel:process_long {
5151
time = { check_max( 24.h * task.attempt, 'time' ) }
5252
}
5353
withLabel:process_high_memory {
54-
memory = { check_max( 2000.GB * task.attempt, 'memory' ) }
55-
}
54+
memory = { check_max( 60.GB * task.attempt, 'memory' ) }
55+
}
5656
withLabel:error_ignore {
5757
errorStrategy = 'ignore'
5858
}

conf/examples/input_examples/by_taxa/micromonospora.config

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Use as follows:
1313
params {
1414
config_profile_name = 'Annotate all RefSeq Micromonospora'
1515
config_profile_description = 'Minimal test dataset to check pipeline function'
16-
ncbi_datasets_command ='genome taxon "micromonospora chokorienses" --assembly-source refseq --exclude-atypical'
16+
ncbi_datasets_command ='genome taxon "micromonospora" --assembly-source refseq --exclude-atypical'
1717

1818
/*
1919
///////////////////////////////////
@@ -37,22 +37,45 @@ params {
3737
// want to set fasta_splits to a higher number to allow checkpointing. Howevever, setting
3838
// fasta_splits too high will result in diminishing returns due to overhead and possibly
3939
// too-few proteins per file (would probably keep <1000 for any size of dataset)
40-
fasta_splits = 24
41-
max_cpus = 24
42-
max_memory = '100.GB'
43-
max_time = 48.h
40+
max_cpus = 96
41+
max_memory = '800.GB'
42+
max_time = 500.h
43+
slurm_queue_size = 48
4444

4545
}
4646

4747
process {
4848

49-
withName:'ANTISMASH'{
50-
ext.args = "--skip-zip-file --allow-long-headers --skip-sanitisation --minimal --enable-genefunctions --enable-lanthipeptides --enable-lassopeptides --enable-nrps-pks --enable-sactipeptides --enable-t2pks --enable-thiopeptides --enable-tta"
51-
ext.args2 = "--hmmdetection-strictness 'loose'"
49+
withName:HMMER_HMMSEARCH {
50+
cpus = { check_max (2 * task.attempt, 'cpus' ) }
51+
memory = { check_max (2.GB * task.attempt, 'memory' ) }
52+
time = { check_max (24.h * task.attempt, 'time' ) }
5253
}
53-
54-
withName:'MMSEQS2_CLUSTER'{
55-
// https://github.com/soedinglab/mmseqs2/wiki#how-to-set-the-right-alignment-coverage-to-cluster
56-
ext.args2 = '-c 0.7 --cov-mode 0'
54+
withLabel:process_single {
55+
cpus = { check_max( 1 , 'cpus' ) }
56+
memory = { check_max( 5.GB * task.attempt, 'memory' ) }
57+
time = { check_max( 10.h * task.attempt , 'time' ) }
58+
}
59+
withLabel:process_low {
60+
cpus = { check_max( 1 * task.attempt, 'cpus' ) }
61+
memory = { check_max( 2.GB * task.attempt, 'memory' ) }
62+
time = { check_max( 40.h * task.attempt, 'time' ) }
63+
}
64+
withLabel:process_medium {
65+
cpus = { check_max( 5 * task.attempt, 'cpus' ) }
66+
memory = { check_max( 20.GB * task.attempt, 'memory' ) }
67+
time = { check_max( 80.h * task.attempt, 'time' ) }
68+
}
69+
withLabel:process_high {
70+
cpus = { check_max( 24 * task.attempt, 'cpus' ) }
71+
memory = { check_max( 100.GB * task.attempt, 'memory' ) }
72+
time = { check_max( 16.h * task.attempt, 'time' ) }
73+
}
74+
withLabel:process_long {
75+
time = { check_max( 24.h * task.attempt, 'time' ) }
5776
}
77+
withLabel:process_high_memory {
78+
memory = { check_max( 400.GB * task.attempt, 'memory' ) }
79+
}
80+
5881
}

0 commit comments

Comments
 (0)