From 02687e57e0a5924901cd36069038d8faad159b2d Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Wed, 26 Jul 2023 09:45:08 -0600 Subject: [PATCH] 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 b1f529b..df8d280 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 928e3ba..adb62dd 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 8eee890..76d8d10 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"""