Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove empty mpi-serial settings from config_machines.xml #1454

Merged
merged 6 commits into from
May 4, 2017
Merged

remove empty mpi-serial settings from config_machines.xml #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1402f21
remove empty mpi-serial settings from config_machines.xml
jedwards4b May 2, 2017
8d3def3
add error for machines that do not support mpi-serial
jedwards4b May 2, 2017
c230cde
add back mpi-serial for acme
jedwards4b May 3, 2017
e90430a
force acme to specify mpi-serial
jedwards4b May 3, 2017
91150de
fix unit test
jedwards4b May 3, 2017
3b9e815
result of negotiation
jedwards4b May 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 28 additions & 64 deletions config/acme/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<NODENAME_REGEX>edison</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>intel,gnu,cray</COMPILERS>
<MPILIBS>mpt,mpi-serial</MPILIBS>
<MPILIBS>mpt</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{SCRATCH}/acme_scratch/edison</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -185,7 +185,7 @@
<NODENAME_REGEX>cori</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>intel,gnu,cray</COMPILERS>
<MPILIBS>mpt,mpi-serial</MPILIBS>
<MPILIBS>mpt</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{SCRATCH}/acme_scratch</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -318,7 +318,7 @@
<NODENAME_REGEX>cori-knl-haswell-is-default</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>intel,gnu,cray</COMPILERS>
<MPILIBS>mpt,mpi-serial</MPILIBS>
<MPILIBS>mpt</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{SCRATCH}/acme_scratch</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -453,7 +453,7 @@
<TESTS>acme_developer</TESTS>
<OS>Darwin</OS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>openmpi,mpich,mpi-serial</MPILIBS>
<MPILIBS>openmpi,mpich</MPILIBS>
<RUNDIR>$ENV{HOME}/projects/acme/scratch/$CASE/run</RUNDIR>
<EXEROOT>$ENV{HOME}/projects/acme/scratch/$CASE/bld</EXEROOT>
<DIN_LOC_ROOT>$ENV{HOME}/projects/acme/cesm-inputdata</DIN_LOC_ROOT> <DIN_LOC_ROOT_CLMFORC>$ENV{HOME}/projects/acme/ptclm-data</DIN_LOC_ROOT_CLMFORC>
Expand All @@ -476,7 +476,7 @@
<OS>LINUX</OS>
<TESTS>acme_developer</TESTS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>openmpi,mpich,mpi-serial</MPILIBS>
<MPILIBS>openmpi,mpich</MPILIBS>
<RUNDIR>$ENV{HOME}/projects/acme/scratch/$CASE/run</RUNDIR>
<EXEROOT>$ENV{HOME}/projects/acme/scratch/$CASE/bld</EXEROOT>
<DIN_LOC_ROOT>$ENV{HOME}/projects/acme/cesm-inputdata</DIN_LOC_ROOT>
Expand Down Expand Up @@ -506,7 +506,7 @@
<TESTS>acme_developer</TESTS>
<OS>LINUX</OS>
<COMPILERS>gnu,intel</COMPILERS>
<MPILIBS>openmpi,mpi-serial</MPILIBS>
<MPILIBS>openmpi</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{HOME}/acme/scratch</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -562,7 +562,7 @@
<TESTS>acme_developer</TESTS>
<OS>LINUX</OS>
<COMPILERS>gnu,intel</COMPILERS>
<MPILIBS>openmpi,mpi-serial</MPILIBS>
<MPILIBS>openmpi</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{HOME}/acme/scratch</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -624,7 +624,7 @@
<TESTS>acme_developer</TESTS>
<OS>LINUX</OS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>mpich,mpi-serial</MPILIBS>
<MPILIBS>mpich</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{HOME}/acme/scratch</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -675,7 +675,7 @@
<PROXY>wwwproxy.sandia.gov:80</PROXY>
<TESTS>acme_integration</TESTS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi,mpi-serial</MPILIBS>
<MPILIBS>openmpi</MPILIBS>
<OS>LINUX</OS>
<CIME_OUTPUT_ROOT>/gscratch/$USER/acme_scratch/skybridge</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
Expand Down Expand Up @@ -703,9 +703,6 @@
<arg name="tasks_per_node"> --npernode $PES_PER_NODE</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
<module_system type="module">
<init_path lang="python">/usr/share/Modules/init/python.py</init_path>
<init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
Expand Down Expand Up @@ -754,7 +751,7 @@
<PROXY>wwwproxy.sandia.gov:80</PROXY>
<TESTS>acme_integration</TESTS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi,mpi-serial</MPILIBS>
<MPILIBS>openmpi</MPILIBS>
<OS>LINUX</OS>
<CIME_OUTPUT_ROOT>/gscratch/$USER/acme_scratch</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
Expand Down Expand Up @@ -782,9 +779,6 @@
<arg name="tasks_per_node"> --npernode $PES_PER_NODE</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
<module_system type="module">
<init_path lang="python">/usr/share/Modules/init/python.py</init_path>
<init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
Expand Down Expand Up @@ -832,7 +826,7 @@
<NODENAME_REGEX>b.*.lcrc.anl.gov</NODENAME_REGEX>
<TESTS>acme_integration</TESTS>
<COMPILERS>gnu,pgi,intel,nag</COMPILERS>
<MPILIBS>mvapich,mpich,openmpi,mpi-serial</MPILIBS>
<MPILIBS>mvapich,mpich,openmpi</MPILIBS>
<CIME_OUTPUT_ROOT>/lcrc/project/$PROJECT/$USER/acme_scratch</CIME_OUTPUT_ROOT>
<SAVE_TIMING_DIR>/lcrc/project/$PROJECT</SAVE_TIMING_DIR>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
Expand All @@ -856,9 +850,6 @@
<arg name="num_tasks"> -n $TOTALPES </arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
<module_system type="soft">
<init_path lang="csh">/etc/profile.d/a_softenv.csh</init_path>
<init_path lang="sh">/etc/profile.d/a_softenv.sh</init_path>
Expand Down Expand Up @@ -907,7 +898,7 @@
<NODENAME_REGEX>b.*.lcrc.anl.gov</NODENAME_REGEX>
<TESTS>acme_integration</TESTS>
<COMPILERS>intel,gnu,pgi</COMPILERS>
<MPILIBS>mvapich,openmpi,mpi-serial</MPILIBS>
<MPILIBS>mvapich,openmpi</MPILIBS>
<CIME_OUTPUT_ROOT>/lcrc/group/acme/$USER/acme_scratch</CIME_OUTPUT_ROOT>
<SAVE_TIMING_DIR>/lcrc/group/acme</SAVE_TIMING_DIR>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
Expand Down Expand Up @@ -938,9 +929,6 @@
<arg name="num_tasks"> -n $TOTALPES </arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
<module_system type="soft">
<init_path lang="csh">/etc/profile.d/a_softenv.csh</init_path>
<init_path lang="sh">/etc/profile.d/a_softenv.sh</init_path>
Expand Down Expand Up @@ -1062,7 +1050,7 @@
<machine MACH="sierra">
<DESC>LLNL Linux Cluster, Linux (pgi), 12 pes/node, batch system is Moab</DESC>
<COMPILERS>intel, pgi</COMPILERS>
<MPILIBS>mpich,mpi-serial</MPILIBS>
<MPILIBS>mpich</MPILIBS>
<RUNDIR>/p/lscratche/$CCSMUSER/ACME/$CASE/run</RUNDIR>
<EXEROOT>/p/lscratche/$CCSMUSER/$CASE/bld</EXEROOT>
<CIME_OUTPUT_ROOT>/p/lscratche/$USER</CIME_OUTPUT_ROOT>
Expand Down Expand Up @@ -1092,9 +1080,6 @@
<arg name="num_nodes"> -N {{ num_nodes }}</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
</machine>

<machine MACH="mira">
Expand Down Expand Up @@ -1201,7 +1186,7 @@
<DESC>PNL Haswell cluster, OS is Linux, batch system is SLURM</DESC>
<OS>LINUX</OS>
<COMPILERS>intel,pgi</COMPILERS>
<MPILIBS>mpich,mpi-serial</MPILIBS>
<MPILIBS>mpich</MPILIBS>
<NODENAME_REGEX>constance</NODENAME_REGEX>
<RUNDIR>/pic/scratch/$CCSMUSER/csmruns/$CASE/run</RUNDIR>
<EXEROOT>/pic/scratch/$CCSMUSER/csmruns/$CASE/bld</EXEROOT>
Expand All @@ -1225,9 +1210,6 @@
<arg name="killonbadexit"> --kill-on-bad-exit</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>

</machine>

Expand All @@ -1236,7 +1218,7 @@
<NODENAME_REGEX>oic2</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>mpich,mpi-serial,openmpi</MPILIBS>
<MPILIBS>mpich,openmpi</MPILIBS>
<RUNDIR>/home/$USER/models/ACME/run/$CASE/run</RUNDIR>
<EXEROOT>/home/$USER/models/ACME/run/$CASE/bld</EXEROOT>
<CIME_OUTPUT_ROOT>/home/$USER/models/ACME</CIME_OUTPUT_ROOT>
Expand All @@ -1256,9 +1238,6 @@
<arg name="machine_file">--hostfile $ENV{PBS_NODEFILE}</arg>
</arguments>
</mpirun>
<mpirun mpilib = "mpi-serial">
<executable> </executable>
</mpirun>
<module_system type="module">
<init_path lang="sh">/usr/share/Modules/init/sh</init_path>
<init_path lang="csh">/usr/share/Modules/init/csh</init_path>
Expand All @@ -1284,7 +1263,7 @@
<NODENAME_REGEX>oic5</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>mpich,mpi-serial,openmpi</MPILIBS>
<MPILIBS>mpich,openmpi</MPILIBS>
<RUNDIR>/home/$USER/models/ACME/run/$CASE/run</RUNDIR>
<EXEROOT>/home/$USER/models/ACME/run/$CASE/bld</EXEROOT>
<CIME_OUTPUT_ROOT>/home/$USER/models/ACME</CIME_OUTPUT_ROOT>
Expand All @@ -1304,9 +1283,6 @@
<arg name="machine_file">--hostfile $ENV{PBS_NODEFILE}</arg>
</arguments>
</mpirun>
<mpirun mpilib = "mpi-serial">
<executable> </executable>
</mpirun>
</machine>

<machine MACH="cades">
Expand All @@ -1318,7 +1294,7 @@
<TESTS>acme_developer</TESTS>
<OS>LINUX</OS>
<COMPILERS>gnu,intel</COMPILERS>
<MPILIBS>openmpi,mpi-serial</MPILIBS>
<MPILIBS>openmpi</MPILIBS>
<RUNDIR>/lustre/pfs1/cades-ccsi/scratch/$USER/$CASE/run</RUNDIR>
<EXEROOT>/lustre/pfs1/cades-ccsi/scratch/$USER/$CASE/bld</EXEROOT>
<DIN_LOC_ROOT>/lustre/pfs1/cades-ccsi/proj-shared/project_acme/ACME_inputdata</DIN_LOC_ROOT>
Expand All @@ -1338,9 +1314,6 @@
<arg name="num_tasks"> -np $TOTALPES</arg>
<arg name="machine_file">--hostfile $ENV{PBS_NODEFILE}</arg>
</arguments>
</mpirun>
<mpirun mpilib = "mpi-serial">
<executable> </executable>
</mpirun>
<module_system type="module">
<init_path lang="sh">/usr/share/Modules/init/sh</init_path>
Expand All @@ -1367,7 +1340,7 @@
<NODE_FAIL_REGEX>Received node event ec_node</NODE_FAIL_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>pgi,pgiacc,intel,cray</COMPILERS>
<MPILIBS>mpich,mpi-serial</MPILIBS>
<MPILIBS>mpich</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{HOME}/acme_scratch/$PROJECT</CIME_OUTPUT_ROOT>
<RUNDIR>$ENV{MEMBERWORK}/$PROJECT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -1534,7 +1507,7 @@
<NODENAME_REGEX>eos</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>mpich,mpi-serial</MPILIBS>
<MPILIBS>mpich</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{HOME}/acme_scratch/$PROJECT</CIME_OUTPUT_ROOT>
<RUNDIR>$ENV{MEMBERWORK}/$PROJECT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -1563,9 +1536,7 @@
<arg name="numa_node" > -cc numa_node</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>

<module_system type="module">
<init_path lang="sh">$MODULESHOME/init/sh</init_path>
<init_path lang="csh">$MODULESHOME/init/csh</init_path>
Expand Down Expand Up @@ -1615,7 +1586,7 @@
<!-- This increases the stack size, which is necessary
for CICE to run threaded on this machine -->
<env name="OMP_STACKSIZE">64M</env>

</environment_variables>
</module_system>
</machine>
Expand Down Expand Up @@ -1644,7 +1615,7 @@
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>

<modules>
<command name="purge"/>
<command name="use">/usr/projects/climate/SHARED_CLIMATE/modulefiles/all</command>
Expand Down Expand Up @@ -1687,9 +1658,7 @@
<arg name="num_tasks"> -n {{ num_tasks }}</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>

<GMAKE_J>4</GMAKE_J>
<MAX_TASKS_PER_NODE>36</MAX_TASKS_PER_NODE>
<PES_PER_NODE>32</PES_PER_NODE>
Expand All @@ -1703,7 +1672,7 @@
<NODENAME_REGEX>wf-fe.*.lanl.gov</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>intel,gnu</COMPILERS>
<MPILIBS>openmpi,mvapich,mpi-serial</MPILIBS>
<MPILIBS>openmpi,mvapich</MPILIBS>
<OS>LINUX</OS>
<RUNDIR>/lustre/scratch3/turquoise/$ENV{USER}/ACME/cases/$CASE/run</RUNDIR>
<EXEROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/cases/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -1772,9 +1741,7 @@
<arg name="num_tasks"> -n $TOTALPES</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>

<GMAKE_J>4</GMAKE_J>
<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
<PES_PER_NODE>16</PES_PER_NODE>
Expand All @@ -1788,7 +1755,7 @@
<NODENAME_REGEX>.*yellowstone</NODENAME_REGEX>
<OS>LINUX</OS>
<COMPILERS>intel,pgi,gnu</COMPILERS>
<MPILIBS>mpich2,pempi,mpi-serial</MPILIBS>
<MPILIBS>mpich2,pempi</MPILIBS>
<CIME_OUTPUT_ROOT>/glade/scratch/$USER</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand All @@ -1807,9 +1774,6 @@
<mpirun >
<executable>mpirun.lsf</executable>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
<module_system type="module">
<init_path lang="perl">/glade/apps/opt/lmod/lmod/init/perl</init_path>
<init_path lang="csh">/glade/apps/opt/lmod/lmod/init/csh</init_path>
Expand Down Expand Up @@ -1958,7 +1922,7 @@
<DESC>Lawrencium LR3 cluster at LBL, OS is Linux (intel), batch system is SLURM</DESC>
<OS>LINUX</OS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi,mpi-serial</MPILIBS>
<MPILIBS>openmpi</MPILIBS>
<CIME_OUTPUT_ROOT>/global/scratch/$ENV{USER}</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down Expand Up @@ -2020,7 +1984,7 @@
<DESC>Lawrencium LR2 cluster at LBL, OS is Linux (intel), batch system is SLURM</DESC>
<OS>LINUX</OS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi,mpi-serial</MPILIBS>
<MPILIBS>openmpi</MPILIBS>
<CIME_OUTPUT_ROOT>/global/scratch/$ENV{USER}</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
Expand Down
Loading