Merge branch 'master' into update_azure_regions_vms_2024_07_01

nextflow-io · Jul 2, 2024 · a7b81ea · a7b81ea
2 parents 0027f07 + b45f7c4
commit a7b81ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/docs/executor.md b/docs/executor.md
@@ -223,6 +223,9 @@ Resource requests and other job characteristics can be controlled via the follow
 - {ref}`process-memory`
 - {ref}`process-time`
 
+:::{note} As of Nextflow version 24.06.0-edge, HyperQueue version 0.17.0 or later is required.
+:::
+
 (k8s-executor)=
 
 ## Kubernetes

diff --git a/modules/nextflow/src/main/groovy/nextflow/executor/HyperQueueExecutor.groovy b/modules/nextflow/src/main/groovy/nextflow/executor/HyperQueueExecutor.groovy
@@ -64,7 +64,7 @@ class HyperQueueExecutor extends AbstractGridExecutor {
 
         // No enforcement, Hq just makes sure that the allocated value is below the limit
         if( task.config.getMemory() )
-            result << '--resource' << "mem=${task.config.getMemory().toBytes()}".toString()
+            result << '--resource' << "mem=${task.config.getMemory().toMega()}".toString()
         if( task.config.hasCpus() )
             result << '--cpus'<< task.config.getCpus().toString()
         if( task.config.getTime() )

diff --git a/modules/nextflow/src/test/groovy/nextflow/executor/HyperQueueExecutorTest.groovy b/modules/nextflow/src/test/groovy/nextflow/executor/HyperQueueExecutorTest.groovy
@@ -133,7 +133,7 @@ class HyperQueueExecutorTest extends Specification {
             #HQ --name nf-task-1
             #HQ --log /work/dir/.command.log
             #HQ --cwd /work/dir
-            #HQ --resource mem=8589934592
+            #HQ --resource mem=8192
             #HQ --cpus 4
             #HQ --time-limit 60sec
             #HQ --resource gpus=2