Skip to content

Commit 1442143

Browse files
jonbobjonbob
committed
Merge branch 'xylar/machine/update-chicoma-modules' (PR E3SM-Project#6705)
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
2 parents bf31b4e + 0cb78ea commit 1442143

File tree

3 files changed

+33
-27
lines changed

3 files changed

+33
-27
lines changed

‎cime_config/machines/cmake_macros/gnu_chicoma-cpu.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ endif()
55
set(PIO_FILESYSTEM_HINTS "lustre")
66
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
77
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -g")
8+
string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,--enable-new-dtags")
89
set(MPICC "cc")
910
set(MPICXX "CC")
1011
set(MPIFC "ftn")

‎cime_config/machines/config_machines.xml

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3983,7 +3983,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
39833983
<DIN_LOC_ROOT_CLMFORC>/usr/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
39843984
<DOUT_S_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/archive/$CASE</DOUT_S_ROOT>
39853985
<BASELINE_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER</BASELINE_ROOT>
3986-
<CCSM_CPRNC>/usr/projects/climate/SHARED_CLIMATE/software/badger/cprnc</CCSM_CPRNC>
3986+
<CCSM_CPRNC>/usr/projects/e3sm/software/chicoma-cpu/cprnc</CCSM_CPRNC>
39873987
<GMAKE_J>10</GMAKE_J>
39883988
<TESTS>e3sm_developer</TESTS>
39893989
<NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
@@ -4003,11 +4003,11 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
40034003
</arguments>
40044004
</mpirun>
40054005
<module_system type="module" allow_error="true">
4006-
<init_path lang="perl">/usr/share/lmod/8.3.1/init/perl</init_path>
4006+
<init_path lang="perl">/usr/share/lmod/lmod/init/perl</init_path>
40074007
<!-- does not exist -->
4008-
<init_path lang="python">/usr/share/lmod/8.3.1/init/python</init_path>
4009-
<init_path lang="sh">/usr/share/lmod/8.3.1/init/sh</init_path>
4010-
<init_path lang="csh">/usr/share/lmod/8.3.1/init/csh</init_path>
4008+
<init_path lang="python">/usr/share/lmod/lmod/init/python</init_path>
4009+
<init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
4010+
<init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
40114011
<cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
40124012
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
40134013
<cmd_path lang="sh">module</cmd_path>
@@ -4019,39 +4019,42 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
40194019
<command name="unload">cray-parallel-netcdf</command>
40204020
<command name="unload">cray-netcdf</command>
40214021
<command name="unload">cray-hdf5</command>
4022-
<command name="unload">PrgEnv-gnu</command>
4023-
<command name="unload">PrgEnv-intel</command>
4024-
<command name="unload">PrgEnv-nvidia</command>
4025-
<command name="unload">PrgEnv-cray</command>
4026-
<command name="unload">PrgEnv-aocc</command>
4022+
<command name="unload">gcc</command>
4023+
<command name="unload">gcc-native</command>
40274024
<command name="unload">intel</command>
40284025
<command name="unload">intel-oneapi</command>
40294026
<command name="unload">nvidia</command>
40304027
<command name="unload">aocc</command>
40314028
<command name="unload">cudatoolkit</command>
40324029
<command name="unload">climate-utils</command>
4030+
<command name="unload">cray-libsci</command>
40334031
<command name="unload">craype-accel-nvidia80</command>
40344032
<command name="unload">craype-accel-host</command>
40354033
<command name="unload">perftools-base</command>
40364034
<command name="unload">perftools</command>
40374035
<command name="unload">darshan</command>
4036+
<command name="unload">PrgEnv-gnu</command>
4037+
<command name="unload">PrgEnv-intel</command>
4038+
<command name="unload">PrgEnv-nvidia</command>
4039+
<command name="unload">PrgEnv-cray</command>
4040+
<command name="unload">PrgEnv-aocc</command>
40384041
</modules>
40394042

40404043
<modules compiler="gnu">
4041-
<command name="load">PrgEnv-gnu/8.4.0</command>
4042-
<command name="load">gcc/12.2.0</command>
4043-
<command name="load">cray-libsci/23.05.1.4</command>
4044+
<command name="load">PrgEnv-gnu/8.5.0</command>
4045+
<command name="load">gcc-native/12.3</command>
4046+
<command name="load">cray-libsci/23.12.5</command>
40444047
</modules>
40454048

40464049
<modules compiler="nvidia">
4047-
<command name="load">PrgEnv-nvidia/8.4.0</command>
4048-
<command name="load">nvidia/22.7</command>
4049-
<command name="load">cray-libsci/23.05.1.4</command>
4050+
<command name="load">PrgEnv-nvidia/8.5.0</command>
4051+
<command name="load">nvidia/24.7</command>
4052+
<command name="load">cray-libsci/23.12.5</command>
40504053
</modules>
40514054

40524055
<modules compiler="intel">
4053-
<command name="load">PrgEnv-intel/8.4.0</command>
4054-
<command name="load">intel-classic/2023.2.0</command>
4056+
<command name="load">PrgEnv-intel/8.5.0</command>
4057+
<command name="load">intel/2023.2.0</command>
40554058
</modules>
40564059

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

40634066
<modules>
40644067
<command name="load">craype-accel-host</command>
4065-
<command name="load">craype/2.7.21</command>
4066-
<command name="load">cray-mpich/8.1.26</command>
4067-
<command name="load">libfabric/1.15.2.0</command>
4068-
<command name="load">cray-hdf5-parallel/1.12.2.3</command>
4069-
<command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
4070-
<command name="load">cray-parallel-netcdf/1.12.3.3</command>
4071-
<command name="load">cmake/3.25.1</command>
4068+
<command name="load">craype/2.7.30</command>
4069+
<command name="load">cray-mpich/8.1.28</command>
4070+
<command name="load">cray-hdf5-parallel/1.12.2.9</command>
4071+
<command name="load">cray-netcdf-hdf5parallel/4.9.0.9</command>
4072+
<command name="load">cray-parallel-netcdf/1.12.3.9</command>
4073+
<command name="load">cmake/3.27.7</command>
40724074
</modules>
40734075
</module_system>
40744076

@@ -4090,6 +4092,9 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
40904092
<env name="NETCDF_PATH">$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}</env>
40914093
<env name="PNETCDF_PATH">$ENV{CRAY_PARALLEL_NETCDF_PREFIX}</env>
40924094
</environment_variables>
4095+
<environment_variables compiler="gnu">
4096+
<env name="LD_LIBRARY_PATH">/usr/lib64/gcc/x86_64-suse-linux/12:$ENV{LD_LIBRARY_PATH}</env>
4097+
</environment_variables>
40934098
<resource_limits>
40944099
<resource name="RLIMIT_STACK">-1</resource>
40954100
</resource_limits>

‎components/mpas-framework/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,11 @@ gnu-cray:
396396
"FFLAGS_OPT = -O3 -m64 -ffree-line-length-none -fconvert=big-endian -ffree-form -ffpe-summary=none $${EXTRA_FFLAGS}" \
397397
"CFLAGS_OPT = -O3 -m64" \
398398
"CXXFLAGS_OPT = -O3 -m64" \
399-
"LDFLAGS_OPT = -O3 -m64" \
399+
"LDFLAGS_OPT = -O3 -m64 $(GNU_CRAY_LDFLAGS)" \
400400
"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}" \
401401
"CFLAGS_DEBUG = -g -m64" \
402402
"CXXFLAGS_DEBUG = -g -m64" \
403-
"LDFLAGS_DEBUG = -g -m64" \
403+
"LDFLAGS_DEBUG = -g -m64 $(GNU_CRAY_LDFLAGS)" \
404404
"FFLAGS_OMP = -fopenmp" \
405405
"CFLAGS_OMP = -fopenmp" \
406406
"BUILD_TARGET = $(@)" \

0 commit comments

Comments
 (0)