Skip to content

Commit

Permalink
add back mpi-serial for acme
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedwards4b
jedwards4b committed May 3, 2017
1 parent 8d3def3 commit c230cde
Showing 1 changed file with 35 additions and 31 deletions.
66 changes: 35 additions & 31 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</MPILIBS>
<MPILIBS>mpt,mpi-serial</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</MPILIBS>
<MPILIBS>mpt,mpi-serial</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</MPILIBS>
<MPILIBS>mpt,mpi-serial</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</MPILIBS>
<MPILIBS>openmpi,mpich,mpi-serial</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</MPILIBS>
<MPILIBS>openmpi,mpich,mpi-serial</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</MPILIBS>
<MPILIBS>openmpi,mpi-serial</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</MPILIBS>
<MPILIBS>openmpi,mpi-serial</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</MPILIBS>
<MPILIBS>mpich,mpi-serial</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</MPILIBS>
<MPILIBS>openmpi,mpi-serial</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 @@ -751,7 +751,7 @@
<PROXY>wwwproxy.sandia.gov:80</PROXY>
<TESTS>acme_integration</TESTS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi</MPILIBS>
<MPILIBS>openmpi,mpi-serial</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 @@ -826,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</MPILIBS>
<MPILIBS>mvapich,mpich,openmpi,mpi-serial</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 Down Expand Up @@ -898,7 +898,7 @@
<NODENAME_REGEX>b.*.lcrc.anl.gov</NODENAME_REGEX>
<TESTS>acme_integration</TESTS>
<COMPILERS>intel,gnu,pgi</COMPILERS>
<MPILIBS>mvapich,openmpi</MPILIBS>
<MPILIBS>mvapich,openmpi,mpi-serial</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 @@ -1028,9 +1028,9 @@
<arg name="thread_count"> --envs OMP_NUM_THREADS=$OMP_NUM_THREADS</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable>unsupported</executable>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable>unsupported</executable>
</mpirun>
<module_system type="soft">
<init_path lang="csh">/etc/profile.d/00softenv.csh</init_path>
<cmd_path lang="csh">soft</cmd_path>
Expand All @@ -1053,7 +1053,7 @@
<machine MACH="sierra">
<DESC>LLNL Linux Cluster, Linux (pgi), 12 pes/node, batch system is Moab</DESC>
<COMPILERS>intel, pgi</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<MPILIBS>mpich,mpi-serial</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 @@ -1124,9 +1124,9 @@
<arg name="thread_count"> --envs OMP_NUM_THREADS=$OMP_NUM_THREADS</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable>unsupported</executable>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable>unsupported</executable>
</mpirun>
<module_system type="soft">
<init_path lang="csh">/etc/profile.d/00softenv.csh</init_path>
<cmd_path lang="csh">soft</cmd_path>
Expand Down Expand Up @@ -1192,7 +1192,7 @@
<DESC>PNL Haswell cluster, OS is Linux, batch system is SLURM</DESC>
<OS>LINUX</OS>
<COMPILERS>intel,pgi</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<MPILIBS>mpich,mpi-serial</MPILIBS>
<NODENAME_REGEX>constance</NODENAME_REGEX>
<RUNDIR>/pic/scratch/$CCSMUSER/csmruns/$CASE/run</RUNDIR>
<EXEROOT>/pic/scratch/$CCSMUSER/csmruns/$CASE/bld</EXEROOT>
Expand All @@ -1216,14 +1216,15 @@
<arg name="killonbadexit"> --kill-on-bad-exit</arg>
</arguments>
</mpirun>

</machine>

<machine MACH="oic2">
<DESC>ORNL XK6, os is Linux, 8 pes/node, batch system is PBS</DESC>
<NODENAME_REGEX>oic2</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>mpich,openmpi</MPILIBS>
<MPILIBS>mpich,mpi-serial,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 Down Expand Up @@ -1268,7 +1269,7 @@
<NODENAME_REGEX>oic5</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>mpich,openmpi</MPILIBS>
<MPILIBS>mpich,mpi-serial,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 Down Expand Up @@ -1299,7 +1300,7 @@
<TESTS>acme_developer</TESTS>
<OS>LINUX</OS>
<COMPILERS>gnu,intel</COMPILERS>
<MPILIBS>openmpi</MPILIBS>
<MPILIBS>openmpi,mpi-serial</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 Down Expand Up @@ -1345,7 +1346,7 @@
<NODE_FAIL_REGEX>Received node event ec_node</NODE_FAIL_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>pgi,pgiacc,intel,cray</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<MPILIBS>mpich,mpi-serial</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 @@ -1512,7 +1513,7 @@
<NODENAME_REGEX>eos</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<MPILIBS>mpich,mpi-serial</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 @@ -1541,6 +1542,7 @@
<arg name="numa_node" > -cc numa_node</arg>
</arguments>
</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 @@ -1590,7 +1592,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 @@ -1619,7 +1621,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 @@ -1662,6 +1664,7 @@
<arg name="num_tasks"> -n {{ num_tasks }}</arg>
</arguments>
</mpirun>

<GMAKE_J>4</GMAKE_J>
<MAX_TASKS_PER_NODE>36</MAX_TASKS_PER_NODE>
<PES_PER_NODE>32</PES_PER_NODE>
Expand All @@ -1675,7 +1678,7 @@
<NODENAME_REGEX>wf-fe.*.lanl.gov</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>intel,gnu</COMPILERS>
<MPILIBS>openmpi,mvapich</MPILIBS>
<MPILIBS>openmpi,mvapich,mpi-serial</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 @@ -1744,6 +1747,7 @@
<arg name="num_tasks"> -n $TOTALPES</arg>
</arguments>
</mpirun>

<GMAKE_J>4</GMAKE_J>
<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
<PES_PER_NODE>16</PES_PER_NODE>
Expand All @@ -1757,7 +1761,7 @@
<NODENAME_REGEX>.*yellowstone</NODENAME_REGEX>
<OS>LINUX</OS>
<COMPILERS>intel,pgi,gnu</COMPILERS>
<MPILIBS>mpich2,pempi</MPILIBS>
<MPILIBS>mpich2,pempi,mpi-serial</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 Down Expand Up @@ -1924,7 +1928,7 @@
<DESC>Lawrencium LR3 cluster at LBL, OS is Linux (intel), batch system is SLURM</DESC>
<OS>LINUX</OS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi</MPILIBS>
<MPILIBS>openmpi,mpi-serial</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 @@ -1986,7 +1990,7 @@
<DESC>Lawrencium LR2 cluster at LBL, OS is Linux (intel), batch system is SLURM</DESC>
<OS>LINUX</OS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi</MPILIBS>
<MPILIBS>openmpi,mpi-serial</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

0 comments on commit c230cde

Please sign in to comment.