Skip to content

Commit 30581c0

Browse files
committed
Smarter choosing of executor
1 parent 631d018 commit 30581c0

File tree

1 file changed

+22
-27
lines changed

1 file changed

+22
-27
lines changed

main.nf

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,9 @@ if (!bamindex) {
5151
module "$params.modules.samtools"
5252

5353
// We only need one core for this part
54-
if ( nextflow_running_as_slurmjob() ) {
55-
executor 'local'
56-
}
57-
else {
58-
executor 'slurm'
59-
queue 'core'
60-
time params.short_job
61-
}
54+
executor choose_executor()
55+
queue 'core'
56+
time params.short_job
6257

6358
when: params.run_manta == true
6459

@@ -135,14 +130,9 @@ if (!params.fastq) {
135130
module "$params.modules.samtools"
136131

137132
// We only need one core for this part
138-
if ( nextflow_running_as_slurmjob() ) {
139-
executor 'local'
140-
}
141-
else {
142-
executor 'slurm'
143-
queue 'core'
144-
time params.short_job
145-
}
133+
executor choose_executor()
134+
queue 'core'
135+
time params.short_job
146136

147137
when: params.run_fermikit == true
148138

@@ -215,7 +205,9 @@ process mask_beds {
215205
publishDir params.outdir, mode: 'copy'
216206

217207
// Does not use many resources, run it locally
218-
executor 'local'
208+
executor choose_executor()
209+
queue 'core'
210+
time params.short_job
219211

220212
module 'bioinfo-tools'
221213
module "$params.modules.bedtools"
@@ -260,7 +252,9 @@ process intersect_files {
260252
publishDir params.outdir, mode: 'copy'
261253

262254
// Does not use many resources, run it locally
263-
executor 'local'
255+
executor choose_executor()
256+
queue 'core'
257+
time params.short_job
264258

265259
module 'bioinfo-tools'
266260
module "$params.modules.bedtools"
@@ -298,14 +292,9 @@ process variant_effect_predictor {
298292
publishDir params.outdir, mode: 'copy'
299293

300294
// We only need one core for this part
301-
if ( nextflow_running_as_slurmjob() ) {
302-
executor 'local'
303-
}
304-
else {
305-
executor 'slurm'
306-
queue 'core'
307-
time params.short_job
308-
}
295+
executor choose_executor()
296+
queue 'core'
297+
time params.short_job
309298

310299
module 'bioinfo-tools'
311300
module "$params.modules.vep"
@@ -361,7 +350,9 @@ process snpEff() {
361350
module "$params.modules.snpeff"
362351

363352
// Does not use many resources, run it locally
364-
executor 'local'
353+
executor choose_executor()
354+
queue 'core'
355+
time params.short_job
365356

366357
script:
367358
"""
@@ -473,3 +464,7 @@ def nextflow_running_as_slurmjob() {
473464
}
474465
return false
475466
}
467+
468+
def choose_executor() {
469+
return nextflow_running_as_slurmjob() ? 'local' : 'slurm'
470+
}

0 commit comments

Comments
 (0)