From 02687e57e0a5924901cd36069038d8faad159b2d Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Wed, 26 Jul 2023 09:45:08 -0600 Subject: [PATCH 1/2] Switch flux to use per resource options rather than per tasks options --- docs/source/queue.md | 2 +- tests/config/flux/flux.sh | 2 +- tests/test_flux.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/queue.md b/docs/source/queue.md index b1f529b8..df8d280f 100644 --- a/docs/source/queue.md +++ b/docs/source/queue.md @@ -41,7 +41,7 @@ The queue named `flux` is defined based on a submission script template named `f # flux: --env=CORES={{cores}} # flux: --output=time.out # flux: --error=error.out -# flux: -n {{cores}} +# flux: --cores {{cores}} {%- if run_time_max %} # flux: -t {{ [1, run_time_max // 60]|max }} {%- endif %} diff --git a/tests/config/flux/flux.sh b/tests/config/flux/flux.sh index 928e3ba1..adb62dd7 100644 --- a/tests/config/flux/flux.sh +++ b/tests/config/flux/flux.sh @@ -3,7 +3,7 @@ # flux: --env=CORES={{cores}} # flux: --output=time.out # flux: --error=error.out -# flux: -n {{cores}} +# flux: --cores {{cores}} {%- if run_time_max %} # flux: -t {{ [1, run_time_max // 60]|max }} {%- endif %} diff --git a/tests/test_flux.py b/tests/test_flux.py index 8eee890f..76d8d101 100644 --- a/tests/test_flux.py +++ b/tests/test_flux.py @@ -86,7 +86,7 @@ def execute_command( # flux: --env=CORES=4 # flux: --output=time.out # flux: --error=error.out -# flux: -n 4 +# flux: --cores 4 # flux: -t 2880 echo hello""" From 653914c75034f754a333f9aec3b302588f2d9867 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Wed, 26 Jul 2023 10:25:00 -0600 Subject: [PATCH 2/2] specify slots in additon --- docs/source/queue.md | 1 + tests/config/flux/flux.sh | 1 + tests/test_flux.py | 1 + 3 files changed, 3 insertions(+) diff --git a/docs/source/queue.md b/docs/source/queue.md index df8d280f..d537130b 100644 --- a/docs/source/queue.md +++ b/docs/source/queue.md @@ -41,6 +41,7 @@ The queue named `flux` is defined based on a submission script template named `f # flux: --env=CORES={{cores}} # flux: --output=time.out # flux: --error=error.out +# flux: --nslots 1 # flux: --cores {{cores}} {%- if run_time_max %} # flux: -t {{ [1, run_time_max // 60]|max }} diff --git a/tests/config/flux/flux.sh b/tests/config/flux/flux.sh index adb62dd7..101c6a83 100644 --- a/tests/config/flux/flux.sh +++ b/tests/config/flux/flux.sh @@ -3,6 +3,7 @@ # flux: --env=CORES={{cores}} # flux: --output=time.out # flux: --error=error.out +# flux: --nslots 1 # flux: --cores {{cores}} {%- if run_time_max %} # flux: -t {{ [1, run_time_max // 60]|max }} diff --git a/tests/test_flux.py b/tests/test_flux.py index 76d8d101..c71b88a0 100644 --- a/tests/test_flux.py +++ b/tests/test_flux.py @@ -86,6 +86,7 @@ def execute_command( # flux: --env=CORES=4 # flux: --output=time.out # flux: --error=error.out +# flux: --nslots 1 # flux: --cores 4 # flux: -t 2880