Get rid of check_max

cbcrg · Oct 18, 2024 · 763c4b8 · 763c4b8
1 parent 21ff6ec
commit 763c4b8
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 37 deletions.
diff --git a/conf/crg.config b/conf/crg.config
@@ -15,21 +15,21 @@ process {
 
     withLabel:process_low {
           queue = 'cn-el7,short-centos79'
-          cpus   = { check_max( 1                  , 'cpus'    ) }
-          memory = { check_max( 4.GB * task.attempt, 'memory'  ) }
-          time   = { check_max( 1.h  * task.attempt, 'time'    ) }
+          cpus   = { 1                   }
+          memory = { 4.GB * task.attempt }
+          time   = { 1.h  * task.attempt }
     }
     withLabel:process_medium{
           queue = 'cn-el7,short-centos79'
-          cpus   = { check_max( 4                  , 'cpus'    ) }
-          memory = { check_max( 10.GB * task.attempt, 'memory'  ) }
-          time   = { check_max( 6.h  * task.attempt, 'time'    ) }
+          cpus   = { 4                    }
+          memory = { 10.GB * task.attempt }
+          time   = { 6.h   * task.attempt }
     }
     withLabel:process_high {
         queue = 'cn-el7,long-centos79'
-        cpus   = { check_max( 12                  , 'cpus'    ) }
-        memory = { check_max( 20.GB * task.attempt, 'memory'  ) }
-        time   = { check_max( 12.h  * task.attempt, 'time'    ) }
+        cpus   = { 12                   }
+        memory = { 20.GB * task.attempt }
+        time   = { 12.h  * task.attempt }
 
     }
 }
diff --git a/conf/crg_slurm.config b/conf/crg_slurm.config
@@ -14,21 +14,21 @@ process {
 
     withLabel:process_low {
           clusterOptions = '--qos=shorter'
-          cpus   = { check_max( 1                  , 'cpus'    ) }
-          memory = { check_max( 4.GB * task.attempt, 'memory'  ) }
-          time   = { check_max( 1.h  * task.attempt, 'time'    ) }
+          cpus   = {  1                  }
+          memory = { 4.GB * task.attempt }
+          time   = { 1.h  * task.attempt }
     }
     withLabel:process_medium{
           clusterOptions = '--qos=short'
-          cpus   = { check_max( 4                  , 'cpus'    ) }
-          memory = { check_max( 10.GB * task.attempt, 'memory'  ) }
-          time   = { check_max( 6.h  * task.attempt, 'time'    ) }
+          cpus   = { 4                    }
+          memory = { 10.GB * task.attempt }
+          time   = { 6.h   * task.attempt }
     }
     withLabel:process_high {
         clusterOptions = '--qos=normal'
-        cpus   = { check_max( 12                  , 'cpus'    ) }
-        memory = { check_max( 20.GB * task.attempt, 'memory'  ) }
-        time   = { check_max( 12.h  * task.attempt, 'time'    ) }
+        cpus   = { 12                   }
+        memory = { 20.GB * task.attempt }
+        time   = { 12.h  * task.attempt }
 
     }
 }
diff --git a/conf/local.config b/conf/local.config
@@ -10,18 +10,18 @@ process {
     errorStrategy = params.err_start
 
     withLabel:process_low {
-          cpus   = { check_max( 1                  , 'cpus'    ) }
-          memory = { check_max( 4.GB * task.attempt, 'memory'  ) }
-          time   = { check_max( 1.h  * task.attempt, 'time'    ) }
+          cpus   = { 1                   }
+          memory = { 4.GB * task.attempt }
+          time   = { 1.h  * task.attempt }
        }
     withLabel:process_medium{
-          cpus   = { check_max( 4                  , 'cpus'    ) }
-          memory = { check_max( 10.GB * task.attempt, 'memory'  ) }
-          time   = { check_max( 6.h  * task.attempt, 'time'    ) }
+          cpus   = { 4                    }
+          memory = { 10.GB * task.attempt }
+          time   = { 6.h   * task.attempt }
     }
     withLabel:process_medium_high {
-          cpus   = { check_max( 12                  , 'cpus'    ) }
-          memory = { check_max( 50.GB * task.attempt, 'memory'  ) }
-          time   = { check_max( 12.h  * task.attempt, 'time'    ) }
+          cpus   = { 12                   }
+          memory = { 50.GB * task.attempt }
+          time   = { 12.h  * task.attempt }
     }
 }
diff --git a/conf/test_learn.config b/conf/test_learn.config
@@ -19,24 +19,24 @@ params {
 
 }
 
-// Limit resources so that this can run on GitHub Actions or take benefit from the check_max function
+// Limit resources so that this can run on GitHub Actions
 process {
     maxRetries = params.max_retries
     errorStrategy = params.err_start
 
     withLabel:process_low {
-        cpus   = { check_max( 1                  , 'cpus'    ) }
-        memory = { check_max( 4.GB * task.attempt, 'memory'  ) }
-        time   = { check_max( 10.m  * task.attempt, 'time'    ) }
+        cpus   = { 1                   }
+        memory = { 4.GB * task.attempt }
+        time   = { 10.m * task.attempt }
     }
     withLabel:process_medium{
-        cpus   = { check_max( 2                  , 'cpus'    ) }
-        memory = { check_max( 6.GB * task.attempt, 'memory'  ) }
-        time   = { check_max( 30.m  * task.attempt, 'time'    ) }
+        cpus   = { 2                   }
+        memory = { 6.GB * task.attempt }
+        time   = { 30.m * task.attempt }
     }
     withLabel:process_high {
-        cpus   = { check_max( 4                  , 'cpus'    ) }
-        memory = { check_max( 8.GB * task.attempt, 'memory'  ) }
-        time   = { check_max( 1.h  * task.attempt, 'time'    ) }
+        cpus   = { 4                   }
+        memory = { 8.GB * task.attempt }
+        time   = { 1.h  * task.attempt }
     }
 }