Skip to content

Commit

Permalink
Merge branch 'xylar/machine/update-chicoma-modules' into next (PR #6705)
Browse files Browse the repository at this point in the history 
Update chicoma-cpu gnu and nvidia builds

Following the recent DST, this merge updates the module files and
environment variables on LANL machine Chicoma-CPU. We note that these
updates work well for gnu and nvidia compilers but not yet for intel,
which we are continuing to work on. A separate update will be needed to
address Chicoma-GPU as well.

An environment variable has also been added to the MPAS standalone
framework to accommodate overriding the library path for standard c++
on Chicoma.

[BFB] for all E3SM testing
  • Loading branch information
@jonbob
jonbob committed Oct 24, 2024
2 parents 56a6668 + 0cb78ea commit 4b91535
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 27 deletions.
1 change: 1 addition & 0 deletions cime_config/machines/cmake_macros/gnu_chicoma-cpu.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ endif()
set(PIO_FILESYSTEM_HINTS "lustre")
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,--enable-new-dtags")
set(MPICC "cc")
set(MPICXX "CC")
set(MPIFC "ftn")
Expand Down
55 changes: 30 additions & 25 deletions cime_config/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3983,7 +3983,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
<DIN_LOC_ROOT_CLMFORC>/usr/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER</BASELINE_ROOT>
<CCSM_CPRNC>/usr/projects/climate/SHARED_CLIMATE/software/badger/cprnc</CCSM_CPRNC>
<CCSM_CPRNC>/usr/projects/e3sm/software/chicoma-cpu/cprnc</CCSM_CPRNC>
<GMAKE_J>10</GMAKE_J>
<TESTS>e3sm_developer</TESTS>
<NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
Expand All @@ -4003,11 +4003,11 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
</arguments>
</mpirun>
<module_system type="module" allow_error="true">
<init_path lang="perl">/usr/share/lmod/8.3.1/init/perl</init_path>
<init_path lang="perl">/usr/share/lmod/lmod/init/perl</init_path>
<!-- does not exist -->
<init_path lang="python">/usr/share/lmod/8.3.1/init/python</init_path>
<init_path lang="sh">/usr/share/lmod/8.3.1/init/sh</init_path>
<init_path lang="csh">/usr/share/lmod/8.3.1/init/csh</init_path>
<init_path lang="python">/usr/share/lmod/lmod/init/python</init_path>
<init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
<init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
<cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
<cmd_path lang="sh">module</cmd_path>
Expand All @@ -4019,39 +4019,42 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
<command name="unload">cray-parallel-netcdf</command>
<command name="unload">cray-netcdf</command>
<command name="unload">cray-hdf5</command>
<command name="unload">PrgEnv-gnu</command>
<command name="unload">PrgEnv-intel</command>
<command name="unload">PrgEnv-nvidia</command>
<command name="unload">PrgEnv-cray</command>
<command name="unload">PrgEnv-aocc</command>
<command name="unload">gcc</command>
<command name="unload">gcc-native</command>
<command name="unload">intel</command>
<command name="unload">intel-oneapi</command>
<command name="unload">nvidia</command>
<command name="unload">aocc</command>
<command name="unload">cudatoolkit</command>
<command name="unload">climate-utils</command>
<command name="unload">cray-libsci</command>
<command name="unload">craype-accel-nvidia80</command>
<command name="unload">craype-accel-host</command>
<command name="unload">perftools-base</command>
<command name="unload">perftools</command>
<command name="unload">darshan</command>
<command name="unload">PrgEnv-gnu</command>
<command name="unload">PrgEnv-intel</command>
<command name="unload">PrgEnv-nvidia</command>
<command name="unload">PrgEnv-cray</command>
<command name="unload">PrgEnv-aocc</command>
</modules>

<modules compiler="gnu">
<command name="load">PrgEnv-gnu/8.4.0</command>
<command name="load">gcc/12.2.0</command>
<command name="load">cray-libsci/23.05.1.4</command>
<command name="load">PrgEnv-gnu/8.5.0</command>
<command name="load">gcc-native/12.3</command>
<command name="load">cray-libsci/23.12.5</command>
</modules>

<modules compiler="nvidia">
<command name="load">PrgEnv-nvidia/8.4.0</command>
<command name="load">nvidia/22.7</command>
<command name="load">cray-libsci/23.05.1.4</command>
<command name="load">PrgEnv-nvidia/8.5.0</command>
<command name="load">nvidia/24.7</command>
<command name="load">cray-libsci/23.12.5</command>
</modules>

<modules compiler="intel">
<command name="load">PrgEnv-intel/8.4.0</command>
<command name="load">intel-classic/2023.2.0</command>
<command name="load">PrgEnv-intel/8.5.0</command>
<command name="load">intel/2023.2.0</command>
</modules>

<modules compiler="amdclang">
Expand All @@ -4062,13 +4065,12 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss

<modules>
<command name="load">craype-accel-host</command>
<command name="load">craype/2.7.21</command>
<command name="load">cray-mpich/8.1.26</command>
<command name="load">libfabric/1.15.2.0</command>
<command name="load">cray-hdf5-parallel/1.12.2.3</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
<command name="load">cray-parallel-netcdf/1.12.3.3</command>
<command name="load">cmake/3.25.1</command>
<command name="load">craype/2.7.30</command>
<command name="load">cray-mpich/8.1.28</command>
<command name="load">cray-hdf5-parallel/1.12.2.9</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.9</command>
<command name="load">cray-parallel-netcdf/1.12.3.9</command>
<command name="load">cmake/3.27.7</command>
</modules>
</module_system>

Expand All @@ -4090,6 +4092,9 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
<env name="NETCDF_PATH">$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}</env>
<env name="PNETCDF_PATH">$ENV{CRAY_PARALLEL_NETCDF_PREFIX}</env>
</environment_variables>
<environment_variables compiler="gnu">
<env name="LD_LIBRARY_PATH">/usr/lib64/gcc/x86_64-suse-linux/12:$ENV{LD_LIBRARY_PATH}</env>
</environment_variables>
<resource_limits>
<resource name="RLIMIT_STACK">-1</resource>
</resource_limits>
Expand Down
4 changes: 2 additions & 2 deletions components/mpas-framework/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,11 @@ gnu-cray:
"FFLAGS_OPT = -O3 -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form -ffpe-summary=none $${EXTRA_FFLAGS}" \
"CFLAGS_OPT = -O3 -m64" \
"CXXFLAGS_OPT = -O3 -m64" \
"LDFLAGS_OPT = -O3 -m64" \
"LDFLAGS_OPT = -O3 -m64 $(GNU_CRAY_LDFLAGS)" \
"FFLAGS_DEBUG = -g -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow -ffpe-summary=none $${EXTRA_FFLAGS}" \
"CFLAGS_DEBUG = -g -m64" \
"CXXFLAGS_DEBUG = -g -m64" \
"LDFLAGS_DEBUG = -g -m64" \
"LDFLAGS_DEBUG = -g -m64 $(GNU_CRAY_LDFLAGS)" \
"FFLAGS_OMP = -fopenmp" \
"CFLAGS_OMP = -fopenmp" \
"BUILD_TARGET = $(@)" \
Expand Down

0 comments on commit 4b91535

Please sign in to comment.