Skip to content

Commit

Permalink
Merge 02687e5 into 341e070
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-janssen committed Jul 26, 2023
2 parents 341e070 + 02687e5 commit 3ec4079
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/source/queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion tests/config/flux/flux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_flux.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
Expand Down

0 comments on commit 3ec4079

Please sign in to comment.