Skip to content

Commit

Permalink
Merge pull request #1454 from jedwards4b/mpi-serial-cleanup
Browse files Browse the repository at this point in the history 
remove empty mpi-serial settings from config_machines.xml
Remove the requirement to have mpilib mpi-serial explicitly listed in the config_machines.xml file since it is assumed supported on all systems. Remove the empty executable field for that library.

Test suite: scripts_regression_tests.py, preview_run (thanks for this!), SMS_Mmpi-serial.f19_g17.X.hobart_intel
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes #1220

User interface changes?: no

Code review:rjacob, jayesh, ...
  • Loading branch information
@jedwards4b
jedwards4b authored May 4, 2017
2 parents 4d4281f + 3b9e815 commit 7aadd49
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 117 deletions.
88 changes: 26 additions & 62 deletions config/acme/machines/config_machines.xml
View file
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 @@ -570,7 +570,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 @@ -634,7 +634,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 @@ -695,7 +695,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 @@ -723,9 +723,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 @@ -778,7 +775,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 @@ -806,9 +803,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 @@ -860,7 +854,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 @@ -884,9 +878,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 @@ -935,7 +926,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 @@ -966,9 +957,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 @@ -1090,7 +1078,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 @@ -1120,9 +1108,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 @@ -1229,7 +1214,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 @@ -1253,9 +1238,6 @@
<arg name="killonbadexit"> --kill-on-bad-exit</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>

</machine>

Expand All @@ -1264,7 +1246,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 @@ -1284,9 +1266,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 @@ -1312,7 +1291,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 @@ -1332,9 +1311,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 @@ -1346,7 +1322,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 @@ -1366,9 +1342,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 @@ -1395,7 +1368,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 @@ -1580,7 +1553,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 @@ -1609,9 +1582,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 @@ -1733,9 +1704,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 @@ -1749,7 +1718,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 @@ -1818,9 +1787,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 @@ -1834,7 +1801,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 @@ -1853,9 +1820,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 @@ -2004,7 +1968,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 @@ -2066,7 +2030,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

0 comments on commit 7aadd49

Please sign in to comment.