Removed unnecessary resource requests in modules.conf in favor of nf-…

…core labels
nf-core · May 10, 2024 · 841399d · 841399d
1 parent 9dc069b
commit 841399d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/conf/modules.config b/conf/modules.config
@@ -35,8 +35,6 @@ process {
     }
 
     withName: "FORCE_GENERATE_ANALYSIS_MASK" {
-        memory = { 500.MB * task.attempt }
-        time   = { 20.minute * task.attempt }
         publishDir = [
             path:    { "${params.outdir}/preparation/" },
             mode:    params.publish_dir_mode,
@@ -45,8 +43,6 @@ process {
     }
 
     withName: "FORCE_GENERATE_TILE_ALLOW_LIST" {
-        memory = { 500.MB * task.attempt }
-        time   = { 20.minute * task.attempt }
         publishDir = [
             path:    { "${params.outdir}/preparation/" },
             pattern: '*.txt',
@@ -55,9 +51,6 @@ process {
     }
 
     withName: "FORCE_PREPROCESS" {
-        cpus          = 4
-        memory        = { 4500.MB * task.attempt }
-        time          = { 2.h * task.attempt }
         errorStrategy = 'retry'
         maxRetries    = 5
         publishDir    = [
@@ -74,15 +67,6 @@ process {
         ]
     }
 
-    withName: "MERGE_BOA" {
-        memory = { 2000.MB * task.attempt }
-        time   = { 2.h * task.attempt }
-    }
-
-    withName: "MERGE_QAI" {
-        memory = { 2000.MB * task.attempt }
-        time   = { 2.h * task.attempt }
-    }
 
     withName: "HIGHER_LEVEL_CONFIG" {
         errorStrategy = 'retry'
@@ -95,9 +79,6 @@ process {
     }
 
     withName: "FORCE_HIGHER_LEVEL" {
-        cpus   = 6
-        memory = { (params.only_tile ? 12000.MB : 3300.MB ) * task.attempt }
-        time   = { 2.h * task.attempt }
         publishDir = [
             path:    { "${params.outdir}/higher-level/${task.tag}" },
             mode:    'symlink',
@@ -107,8 +88,6 @@ process {
     }
 
     withName: "FORCE_PYRAMID" {
-        memory      = { 1500.MB * task.attempt }
-        time        = { 20.minute * task.attempt }
         stageInMode = 'copy'
         publishDir  = [
             [
@@ -126,8 +105,6 @@ process {
     }
 
     withName: "FORCE_MOSAIC" {
-        memory     = { 1500.MB * task.attempt }
-        time       = { 20.minute * task.attempt }
         publishDir = [
             path:    { "${params.outdir}/trend/mosaic/" },
             mode:    params.publish_dir_mode,
@@ -137,8 +114,6 @@ process {
 
     withName: "CHECK_RESULTS" {
         errorStrategy = { task.exitStatus == 143 ? 'retry' : 'ignore' }
-        memory        = { 14000.MB * task.attempt }
-        time          = { 2.h * task.attempt }
         publishDir    = [
             enabled: false
         ]

diff --git a/modules/local/force-higher_level.nf b/modules/local/force-higher_level.nf
@@ -2,7 +2,7 @@ nextflow.enable.dsl = 2
 
 process FORCE_HIGHER_LEVEL {
 
-    label 'process_high'
+    label 'process_medium'
 
     container "docker.io/davidfrantz/force:3.7.10"
     tag { tile }