Skip to content

Commit

Permalink
Merge branch 'jonbob/cime/update-ic-machines-041417' (PR #1412)
Browse files Browse the repository at this point in the history 
Update LANL IC machines to work with CIME5.2/5.3

This PR updates the LANL IC machines wolf and grizzly to work with changes
arising from the move to CIME5.2 and CIME5.3. It includes changes cherry-picked
from branch:
     vanroekel/LANL_grizzly_update
and modifications for wolf.

Tested with:
-compset CMPASO-NYF -res T62_oEC60to30v3 -mach grizzly
-compset CMPASO-NYF -res T62_oEC60to30v3 -mach wolf

[BFB]
  • Loading branch information
@jonbob
jonbob committed Apr 20, 2017
2 parents 3bc293f + 0c6f53a commit 29397e7
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 64 deletions.
16 changes: 10 additions & 6 deletions config/acme/machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,18 +285,22 @@
</batch_system>

<batch_system MACH="grizzly" type="moab" >
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
</directives>
<queues>
<queue walltimemax="16:00:00" default="true">moab</queue>
</queues>
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
<directive>-l qos=standard </directive>
</directives>
<queues>
<queue walltimemax="16:00:00" default="true">moab</queue>
</queues>
</batch_system>

<batch_system MACH="wolf" type="moab" >
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
</directives>
<queues>
<queue walltimemax="16:00:00" default="true">moab</queue>
</queues>
</batch_system>

<batch_system MACH="mesabi" type="pbs">
Expand Down
2 changes: 2 additions & 0 deletions config/acme/machines/config_compilers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,7 @@ for mct, etc.
</compiler>

<compiler MACH="grizzly" COMPILER="gnu">
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
<MPICC>mpicc</MPICC>
<MPIFC>mpif90</MPIFC>
<MPICXX>mpic++</MPICXX>
Expand All @@ -1163,6 +1164,7 @@ for mct, etc.
</compiler>

<compiler MACH="grizzly" COMPILER="intel">
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
<MPICC>mpicc</MPICC>
<MPIFC>mpif90</MPIFC>
<MPICXX>mpic++</MPICXX>
Expand Down
121 changes: 63 additions & 58 deletions config/acme/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1822,7 +1822,7 @@
<NODENAME_REGEX>gr-fe.*.lanl.gov</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>gnu,intel</COMPILERS>
<MPILIBS>openmpi</MPILIBS>
<MPILIBS>mvapich,openmpi</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 All @@ -1846,7 +1846,6 @@
<modules>
<command name="purge"/>
<command name="use">/usr/projects/climate/SHARED_CLIMATE/modulefiles/all</command>
<command name="load">friendly-testing</command>
<command name="load">python/anaconda-2.7-climate</command>
</modules>

Expand All @@ -1859,7 +1858,9 @@
<modules mpilib="openmpi">
<command name="load">openmpi/1.10.5</command>
</modules>

<modules mpilib="mvapich">
<command name="load">mvapich2/2.2</command>
</modules>
<modules>
<command name="load">netcdf/4.4.1</command>
</modules>
Expand All @@ -1868,21 +1869,26 @@
</modules>
</module_system>
<environment_variables>
<env name="LD_LIBRARY_PATH">$LD_LIBRARY_PATH:$NETCDF_ROOT/lib</env>
<env name="PNETCDF_HINTS">romio_ds_write=disable;romio_ds_read=disable</env>
<env name="PNETCDF_HINTS">romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable</env>
</environment_variables>

<BATCH_SYSTEM>moab</BATCH_SYSTEM>
<mpirun mpilib="default">
<executable>mpirun</executable>
<arguments>
<arg name="num_tasks"> -n {{ num_tasks }}</arg>
<arg name="num_tasks"> -n $TOTALPES</arg>
</arguments>
</mpirun>
<mpirun mpilib="mvapich">
<executable>srun</executable>
<arguments>
<arg name="num_tasks"> -n $TOTALPES</arg>
</arguments>
</mpirun>
<mpirun mpilib="openmpi">
<executable>mpirun</executable>
<arguments>
<arg name="num_tasks"> -n {{ num_tasks }}</arg>
<arg name="num_tasks"> -n $TOTALPES</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
Expand All @@ -1902,57 +1908,24 @@
<TESTS>acme_developer</TESTS>
<COMPILERS>intel,gnu</COMPILERS>
<MPILIBS>openmpi,mvapich,mpi-serial</MPILIBS>
<OS>LINUX</OS>
<CIME_OUTPUT_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/scratch</CIME_OUTPUT_ROOT>
<RUNDIR>/lustre/scratch3/turquoise/$ENV{USER}/ACME/cases/$CASE/run</RUNDIR>
<EXEROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/cases/$CASE/bld</EXEROOT>
<DIN_LOC_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/archive/$CASE</DOUT_S_ROOT>
<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
<OS>LINUX</OS>
<BATCH_SYSTEM>moab</BATCH_SYSTEM>
<SUPPORTED_BY>jonbob -at- lanl.gov</SUPPORTED_BY>
<GMAKE_J>4</GMAKE_J>
<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
<PES_PER_NODE>16</PES_PER_NODE>
<PROJECT>climateacme</PROJECT>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<DIN_LOC_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<BASELINE_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/ccsm_baselines</BASELINE_ROOT>
<CIME_OUTPUT_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/scratch</CIME_OUTPUT_ROOT>
<SAVE_TIMING_DIR>$CASEROOT/timings</SAVE_TIMING_DIR>
<CCSM_CPRNC>/turquoise/usr/projects/climate/SHARED_CLIMATE/software/wolf/cprnc/v0.40/cprnc</CCSM_CPRNC>
<module_system type="module">
<init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
<init_path lang="python">/usr/share/Modules/init/python.py</init_path>
<init_path lang="sh">/usr/share/Modules/init/sh</init_path>
<init_path lang="csh">/usr/share/Modules/init/csh</init_path>
<cmd_path lang="perl">/usr/bin/modulecmd perl</cmd_path>
<cmd_path lang="python">/usr/bin/modulecmd 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>
<command name="load">friendly-testing</command>
<command name="load">python/anaconda-2.7-climate</command>
</modules>
<modules compiler="intel">
<command name="load">intel/15.0.5</command>
<command name="load">mkl/11.3.3</command>
</modules>
<modules compiler="gnu">
<command name="load">gcc/4.8.2</command>
</modules>
<modules mpilib="openmpi">
<command name="load">openmpi/1.6.5</command>
</modules>
<modules mpilib="mvapich">
<command name="load">mvapich2/1.8</command>
</modules>
<modules>
<command name="load">netcdf/4.4.0</command>
</modules>
<modules mpilib="!mpi-serial">
<command name="load">parallel-netcdf/1.5.0</command>
</modules>
</module_system>
<environment_variables>
<env name="LD_LIBRARY_PATH">$LD_LIBRARY_PATH:$NETCDF_ROOT/lib</env>
</environment_variables>

<BATCH_SYSTEM>moab</BATCH_SYSTEM>
<SAVE_TIMING_DIR>$CASEROOT/timings</SAVE_TIMING_DIR>
<mpirun mpilib="default">
<executable>mpirun</executable>
<arguments>
Expand All @@ -1974,12 +1947,44 @@
<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>
<PROJECT>climateacme</PROJECT>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<SUPPORTED_BY>jonbob -at- lanl.gov</SUPPORTED_BY>
<module_system type="module">
<init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
<init_path lang="python">/usr/share/Modules/init/python.py</init_path>
<init_path lang="sh">/usr/share/Modules/init/sh</init_path>
<init_path lang="csh">/usr/share/Modules/init/csh</init_path>
<cmd_path lang="perl">/usr/bin/modulecmd perl</cmd_path>
<cmd_path lang="python">/usr/bin/modulecmd 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>
<command name="load">friendly-testing</command>
<command name="load">python/anaconda-2.7-climate</command>
</modules>
<modules compiler="intel">
<command name="load">intel/15.0.5</command>
<command name="load">mkl/11.3.3</command>
</modules>
<modules compiler="gnu">
<command name="load">gcc/4.8.2</command>
</modules>
<modules mpilib="openmpi">
<command name="load">openmpi/1.6.5</command>
</modules>
<modules mpilib="mvapich">
<command name="load">mvapich2/1.8</command>
</modules>
<modules>
<command name="load">netcdf/4.4.0</command>
</modules>
<modules mpilib="!mpi-serial">
<command name="load">parallel-netcdf/1.5.0</command>
</modules>
</module_system>
<environment_variables>
<env name="LD_LIBRARY_PATH">$ENV{LD_LIBRARY_PATH}:$ENV{NETCDF_ROOT}/lib</env>
</environment_variables>
</machine>

<machine MACH="caldera">
Expand Down
1 change: 1 addition & 0 deletions config/acme/machines/config_pio.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<value mach="lawrencium-lr2">netcdf</value>
<value mach="lawrencium-lr3">netcdf</value>
<value mach="cades">netcdf</value>
<value mach="grizzly">netcdf</value>
<value mpilib="mpi-serial">netcdf</value>
</values>
</entry>
Expand Down

0 comments on commit 29397e7

Please sign in to comment.