Skip to content

Commit

Permalink
Merge pull request #156 from jedwards4b/pbs_V_removed
Browse files Browse the repository at this point in the history 
Pbs v removed
  • Loading branch information
@jedwards4b
jedwards4b authored Mar 8, 2024
2 parents 4b66082 + bd805a2 commit 259f054
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 115 deletions.
2 changes: 1 addition & 1 deletion machines/Depends.cray
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NOOPTOBJS= ice_boundary.o dyn_comp.o unicon.o
NOOPTOBJS= ice_boundary.o dyn_comp.o unicon.o SnowHydrologyMod.o

# RRTMGP contains openmp directives for running on GPUs. These directives need to be
# disabled to allow building CAM with threading on CPUs enabled.
Expand Down
125 changes: 11 additions & 114 deletions machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@
<directive default="n"> -r {{ rerunnable }} </directive>
<!-- <directive> -j oe {{ job_id }} </directive> -->
<directive> -j oe </directive>
<directive> -V </directive>
</directives>
</batch_system>

Expand Down Expand Up @@ -185,6 +184,8 @@
<directives>
<directive>-l nodes={{ num_nodes }}</directive>
<directive>-q iccp</directive>
<directive> -V </directive>

</directives>
<queues>
<queue walltimemax="24:00:00" default="true" >iccp</queue>
Expand All @@ -210,19 +211,6 @@
</queues>
</batch_system>

<!-- bluewaters is PBS -->
<batch_system MACH="bluewaters" type="pbs" >
<jobid_pattern>(\d+.bw)$</jobid_pattern>
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}:xe</directive>
<directive default="/bin/bash" > -S {{ shell }} </directive>
</directives>
<queues>
<queue walltimemax="24:00:00">normal</queue>
<queue walltimemax="00:30:00" nodemin="1" nodemax="16" default="true">debug</queue>
</queues>
</batch_system>

<!-- casper pbs -->
<batch_system MACH="casper" type="pbs">
<batch_submit>qsub</batch_submit>
Expand All @@ -237,47 +225,13 @@
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=300GB:ngpus={{ ngpus_per_node }} </directive>
</directives>

<!-- Unknown queues use the batch directives for the regular queue -->
<unknown_queue_directives>casper</unknown_queue_directives>

<queues>
<queue walltimemax="12:00:00" nodemin="1" nodemax="10">casper</queue>
</queues>
</batch_system>

<batch_system MACH="cheyenne" type="pbs">
<directives queue="regular">
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
</directives>

<directives queue="premium">
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
</directives>

<directives queue="economy">
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
</directives>

<directives queue="share">
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -l select=1:mpiprocs={{ total_tasks }}:ompthreads={{ thread_count }}</directive>
</directives>

<!-- Unknown queues use the batch directives for the regular queue -->
<unknown_queue_directives>regular</unknown_queue_directives>

<queues>
<queue walltimemax="12:00:00" nodemin="1" nodemax="4032">regular</queue>
<queue walltimemax="12:00:00" nodemin="1" nodemax="4032">premium</queue>
<queue default="true" walltimemax="06:00:00" jobmin="1" jobmax="18">share</queue>
<queue walltimemax="12:00:00" nodemin="1" nodemax="4032">economy</queue>
</queues>
</batch_system>

<!-- coeus slurm -->
<batch_system MACH="coeus" type="slurm" >
<batch_query per_job_arg="-j">squeue</batch_query>
Expand Down Expand Up @@ -311,39 +265,6 @@
</submit_args>
</batch_system>

<batch_system MACH="cori-haswell" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -q $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<directives>
<directive>-C haswell </directive>
</directives>
<queues>
<queue walltimemax="06:00:00" nodemin="1" nodemax="710">regular</queue>
<!-- <queue walltimemax="00:30:00" nodemin="1" nodemax="3072" default="true">debug</queue> -->
</queues>
</batch_system>

<batch_system MACH="cori-knl" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
<argument> --time $JOB_WALLCLOCK_TIME </argument>
<argument> -q $JOB_QUEUE </argument>
<argument> --account $PROJECT </argument>
</submit_args>
<directives>
<directive>-C knl,quad,cache </directive>
<directive>-S 2 </directive>
</directives>
<queues>
<queue walltimemax="02:00:00" nodemin="1" nodemax="177">regular</queue>
<!-- <queue walltimemax="00:30:00" nodemin="1" nodemax="3072" default="true">debug</queue> -->
</queues>
</batch_system>

<batch_system MACH="daint" type="slurm" >
<batch_submit>sbatch</batch_submit>
<submit_args>
Expand Down Expand Up @@ -450,6 +371,7 @@
<directive>-d $RUNDIR</directive>
<directive>-o $RUNDIR/$CASE.out </directive>
<directive>-S /bin/bash </directive>
<directive>-V</directive>
</directives>
<queues>
<queue walltimemax="01:00:00" nodemin="1" nodemax="35">debug</queue>
Expand Down Expand Up @@ -508,28 +430,13 @@
</queues>
</batch_system>

<!-- hobart is PBS -->
<batch_system type="pbs" MACH="hobart" >
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
<directive default="/bin/bash" > -S {{ shell }} </directive>
</directives>
<queues>
<queue walltimemax="02:00:00" strict="true" nodemin="1" nodemax="8">short</queue>
<queue walltimemax="08:00:00" strict="true" nodemin="1" nodemax="6" default="true">medium</queue>
<queue walltimemax="40:00:00" strict="true" nodemin="1" nodemax="8">long</queue>
<queue walltimemax="80:00:00" strict="true" nodemin="1" nodemax="8">verylong</queue>
<queue walltimemax="32:00:00" strict="true" nodemax="16" nodemin="1">overnight</queue>
<queue walltimemax="3000:00:00" strict="true" nodemax="32" nodemin="1">monster</queue>
</queues>
</batch_system>

<batch_system type="pbs" MACH="izumi" >
<batch_system type="pbs" MACH="izumi" >
<batch_submit>qsub</batch_submit>
<jobid_pattern>(\d+.izumi.cgd.ucar.edu)$</jobid_pattern>
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -V </directive>
</directives>
<queues>
<queue walltimemax="02:00:00" strict="true" nodemin="1" nodemax="8">short</queue>
Expand All @@ -541,16 +448,6 @@
</queues>
</batch_system>

<batch_system MACH="laramie" type="pbs">
<directives>
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
</directives>
<queues>
<queue default="true" walltimemax="12:00" nodemin="1" nodemax="72">regular</queue>
</queues>
</batch_system>

<batch_system MACH="lawrencium-lr3" type="slurm">
<batch_submit>sbatch</batch_submit>
<directives>
Expand Down Expand Up @@ -578,17 +475,12 @@
</queues>
</batch_system>

<batch_system MACH="mira" type="cobalt">
<queues>
<queue walltimemax="06:00:00" nodemin="1" nodemax="12288" default="true">default</queue>
</queues>
</batch_system>

<!-- modex is PBS -->
<batch_system MACH="modex" type="pbs">
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -V </directive>
</directives>
<queues>
<queue walltimemax="36:00:00" default="true">batch</queue>
Expand Down Expand Up @@ -632,6 +524,7 @@
<directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=bro</directive>
<directive>-l place=scatter:excl</directive>
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -V </directive>
</directives>
<queues>
<queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
Expand All @@ -647,6 +540,7 @@
<directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=has</directive>
<directive>-l place=scatter:excl</directive>
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -V </directive>
</directives>
<queues>
<queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
Expand All @@ -662,6 +556,7 @@
<directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=ivy</directive>
<directive>-l place=scatter:excl</directive>
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -V </directive>
</directives>
<queues>
<queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
Expand All @@ -677,6 +572,7 @@
<directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=san</directive>
<directive>-l place=scatter:excl</directive>
<directive default="/bin/bash" > -S {{ shell }} </directive>
<directive> -V </directive>
</directives>
<queues>
<queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
Expand Down Expand Up @@ -713,6 +609,7 @@
<batch_system MACH="swan" type="pbs" >
<directives>
<directive>-l nodes={{ num_nodes }}</directive>
<directive> -V </directive>
</directives>
<queues>
<queue walltimemax="24:00:00" default="true" >default</queue>
Expand Down

0 comments on commit 259f054

Please sign in to comment.