Skip to content

Commit

Permalink
updates arg to argument in config_batch.xml, see cime PR #4307
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedwards4b
jedwards4b committed Oct 12, 2022
1 parent 0535c3e commit 7461ce9
Showing 1 changed file with 71 additions and 72 deletions.
143 changes: 71 additions & 72 deletions machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<batch_system MACH="aws-hpc6a" type="slurm">
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
</submit_args>
<queues>
<queue walltimemax="144:00:00" nodemin="1" nodemax="96">regular</queue>
Expand All @@ -79,13 +79,12 @@
<batch_mail_type_flag></batch_mail_type_flag>
<batch_mail_type></batch_mail_type>
<submit_args>
<arg flag="--cwd" name="CASEROOT"/>
<arg flag="-A" name="PROJECT"/>
<arg flag="-t" name="JOB_WALLCLOCK_TIME"/>
<!-- space required at beginning of name -->
<arg flag="-n" name=" $TOTALPES / $MAX_MPITASKS_PER_NODE"/>
<arg flag="-q" name="JOB_QUEUE"/>
<arg flag="--mode script"/>
<argument> --cwd CASEROOT </argument>
<argument> -A PROJECT </argument>
<argument> -t JOB_WALLCLOCK_TIME </argument>
<argument> -n $TOTALPES / $MAX_MPITASKS_PER_NODE </argument>
<argument> -q JOB_QUEUE </argument>
<argument> --mode script </argument>
</submit_args>
</batch_system>

Expand All @@ -101,11 +100,11 @@
<batch_mail_type_flag></batch_mail_type_flag>
<batch_mail_type></batch_mail_type>
<submit_args>
<arg flag="-A" name="PROJECT"/>
<arg flag="-t" name="JOB_WALLCLOCK_TIME"/>
<arg flag="-n" name=" $TOTALPES/$MAX_MPITASKS_PER_NODE"/>
<arg flag="-q" name="JOB_QUEUE"/>
<arg flag="--mode script"/>
<argument> -A PROJECT </argument>
<argument> -t JOB_WALLCLOCK_TIME </argument>
<argument> -n $TOTALPES / $MAX_MPITASKS_PER_NODE </argument>
<argument> -q JOB_QUEUE </argument>
<argument> --mode script </argument>
</submit_args>
</batch_system>

Expand Down Expand Up @@ -148,9 +147,9 @@
<batch_mail_type_flag>-m</batch_mail_type_flag>
<batch_mail_type>, bea, b, e, a</batch_mail_type>
<submit_args>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="-l walltime=" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-A" name="$PROJECT"/>
<argument> -q $JOB_QUEUE</argument>
<argument> -l $JOB_WALLCLOCK_TIME</argument>
<argument> -A $PROJECT</argument>
</submit_args>
<directives>
<directive>-N {{ job_id }}</directive>
Expand Down Expand Up @@ -195,9 +194,9 @@
<!-- athena is lsf -->
<batch_system MACH="athena" type="lsf">
<submit_args>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="-W" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-P" name="$PROJECT"/>
<argument> -q $JOB_QUEUE </argument>
<argument> -W $JOB_WALLCLOCK_TIME </argument>
<argument> -P $PROJECT </argument>
</submit_args>
<directives>
<directive > -R "span[ptile={{ tasks_per_node }}]"</directive>
Expand Down Expand Up @@ -326,18 +325,18 @@
<batch_system type="slurm" MACH="constance">
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
</batch_system>

<batch_system MACH="cori-haswell" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -q $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<directives>
<directive>-C haswell </directive>
Expand All @@ -351,9 +350,9 @@
<batch_system MACH="cori-knl" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -q $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<directives>
<directive>-C knl,quad,cache </directive>
Expand All @@ -368,9 +367,9 @@
<batch_system MACH="daint" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<queues>
<queue default="true">default</queue>
Expand All @@ -380,9 +379,9 @@
<batch_system MACH="eastwind" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<queues>
<queue nodemin="1" nodemax="833" default="true">batch</queue>
Expand All @@ -392,9 +391,9 @@
<batch_system MACH="edison" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -q $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<queues>
<queue walltimemax="36:00:00" nodemin="1" nodemax="2712" >regular</queue>
Expand Down Expand Up @@ -440,9 +439,9 @@
because env variables are not forwarded -->
<batch_submit>ssh login1 cd $CASEROOT ; sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<directives>
<directive> --export=ALL </directive>
Expand Down Expand Up @@ -476,8 +475,8 @@
<batch_system type="slurm" MACH="greenplanet-sib29">
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
</submit_args>
<queues>
<!-- Want case.st_archiver to run on first available queue, but case.run to use sib2.9
Expand All @@ -490,8 +489,8 @@
<batch_system type="slurm" MACH="greenplanet-sky24">
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
</submit_args>
<queues>
<!-- Want case.st_archiver to run on first available queue, but case.run to use sky2.4
Expand Down Expand Up @@ -561,9 +560,9 @@
<batch_system MACH="lonestar5" type="slurm" >
<batch_submit>ssh login1.ls5.tacc.utexas.edu cd $CASEROOT ; sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<queues>
<queue walltimemax="48:00:00" nodemin="1" nodemax="171" default="true">normal</queue>
Expand Down Expand Up @@ -592,9 +591,9 @@
<batch_system MACH="olympus" type="slurm">
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<queues>
<queue walltimemin="0" walltimemax="00:59:00" nodemin="0" nodemax="312" default="true">queue</queue>
Expand All @@ -604,9 +603,9 @@
<batch_system MACH="perlmutter" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -q $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<directives>
<directive>-C gpu </directive>
Expand All @@ -620,7 +619,7 @@
<!-- NAS pleiades machines -->
<batch_system type="pbs" MACH="pleiades-bro" >
<submit_args>
<arg flag="-W group_list=" name="$PROJECT"/>
<argument> -W group_list= $PROJECT </argument>
</submit_args>
<directives>
<directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=bro</directive>
Expand All @@ -635,7 +634,7 @@

<batch_system type="pbs" MACH="pleiades-has" >
<submit_args>
<arg flag="-W group_list=" name="$PROJECT"/>
<argument> -W group_list= $PROJECT </argument>
</submit_args>
<directives>
<directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=has</directive>
Expand All @@ -650,7 +649,7 @@

<batch_system type="pbs" MACH="pleiades-ivy" >
<submit_args>
<arg flag="-W group_list=" name="$PROJECT"/>
<argument> -W group_list= $PROJECT </argument>
</submit_args>
<directives>
<directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=ivy</directive>
Expand All @@ -665,7 +664,7 @@

<batch_system type="pbs" MACH="pleiades-san" >
<submit_args>
<arg flag="-W group_list=" name="$PROJECT"/>
<argument> -W group_list= $PROJECT </argument>
</submit_args>
<directives>
<directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=san</directive>
Expand All @@ -681,9 +680,9 @@
<batch_system MACH="stampede2-skx" type="slurm" >
<batch_submit>ssh stampede2.tacc.utexas.edu cd $CASEROOT ; sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<queues>
<queue walltimemax="48:00:00" nodemin="1" nodemax="256" default="true">skx-normal</queue>
Expand All @@ -694,9 +693,9 @@
<batch_system MACH="stampede2-knl" type="slurm" >
<batch_submit>ssh stampede2.tacc.utexas.edu cd $CASEROOT ; sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -p $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<queues>
<queue walltimemax="48:00:00" nodemin="1" nodemax="256" >normal</queue>
Expand All @@ -716,9 +715,9 @@
<batch_system MACH="theia" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="--account" name="$PROJECT"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -q $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<directives>
<directive>--partition=theia</directive>
Expand All @@ -736,8 +735,8 @@
<batch_system MACH="thunder" type="slurm">
<batch_submit>sbatch</batch_submit>
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-q" name="$JOB_QUEUE"/>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -q $JOB_QUEUE </argument>
</submit_args>
<directives>
<directive>--ntasks-per-node=64</directive>
Expand All @@ -751,9 +750,9 @@
<batch_system MACH="zeus" type="lsf">
<batch_env>-env</batch_env>
<submit_args>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="-W" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-P" name="$PROJECT"/>
<argument> -q $JOB_QUEUE </argument>
<argument> -W $JOB_WALLCLOCK_TIME </argument>
<argument> -P $PROJECT </argument>
</submit_args>
<directives>
<directive > -R "span[ptile={{ tasks_per_node }}]"</directive>
Expand Down

0 comments on commit 7461ce9

Please sign in to comment.