Memory parameter singleCPUMem is now possible to use (#22)

* Memory parameter singleCPUMem is now possible to use * Updated CHANGELOG * No import, but in a new place
nf-core · Sep 2, 2019 · c0d69e1 · c0d69e1
1 parent 04cb96e
commit c0d69e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -88,6 +88,7 @@ Initial release of `nf-core/sarek`, created with the [nf-core](http://nf-co.re/)
 - [#18](https://github.com/nf-core/sarek/pull/18) - Use same font for nf-core and sarek in ascii art
 - [#20](https://github.com/nf-core/sarek/pull/20) - Use new logo in README
 - [#20](https://github.com/nf-core/sarek/pull/20) - Fix path to references genomes
+- [#22](https://github.com/nf-core/sarek/pull/22) - Fix --singleCPUMem issue
 
 ## [2.3.FIX1] - 2019-03-04
 

diff --git a/conf/base.config b/conf/base.config
@@ -22,7 +22,7 @@ params {
 
 process {
   cpus = {check_resource(params.cpus * task.attempt)}
-  memory = {check_resource(params.singleCPUMem * task.attempt)}
+  memory = {check_resource((params.singleCPUMem as nextflow.util.MemoryUnit) * task.attempt)}
   time = {check_resource(24.h * task.attempt)}
   shell = ['/bin/bash', '-euo', 'pipefail']
 
@@ -50,10 +50,10 @@ process {
   }
 
   withLabel:memory_singleCPU_2_task {
-    memory = {check_resource(params.singleCPUMem * 2 * task.attempt)}
+    memory = {check_resource((params.singleCPUMem as nextflow.util.MemoryUnit) * 2 * task.attempt)}
   }
   withLabel:memory_singleCPU_task_sq {
-    memory = {check_resource(params.singleCPUMem * task.attempt * task.attempt)}
+    memory = {check_resource((params.singleCPUMem as nextflow.util.MemoryUnit) * task.attempt * task.attempt)}
   }
 
   withLabel:memory_max {