Skip to content

Commit d782204

Browse files
jonbobjonbob
committed
Merge branch 'jonbob/machines/update-chicoma-gpu' (PR #6791)
Update chicoma-gpu machine files Updates LANL IC platform chicoma-gpu machine files, after recent upgrade Fixes #6778 [BFB]
2 parents b13a08f + bbb309f commit d782204

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ string(APPEND CONFIG_ARGS " --host=cray")
22
if (COMP_NAME STREQUAL gptl)
33
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY")
44
endif()
5-
string(APPEND SLIBS " -lblas -llapack")
6-
set(CXX_LINKER "FORTRAN")
7-
if (NOT DEBUG)
8-
string(APPEND CFLAGS " -O2 -g")
9-
endif()
10-
if (NOT DEBUG)
11-
string(APPEND FFLAGS " -O2 -g")
12-
endif()
13-
string(APPEND CXX_LIBS " -lstdc++")
5+
set(PIO_FILESYSTEM_HINTS "lustre")
6+
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
7+
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -g")
8+
string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,--enable-new-dtags")
149
set(MPICC "cc")
1510
set(MPICXX "CC")
1611
set(MPIFC "ftn")

‎cime_config/machines/config_machines.xml‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4146,8 +4146,7 @@
41464146
</machine>
41474147

41484148
<machine MACH="chicoma-gpu">
4149-
<DESC>Chicoma GPU nodes at LANL IC. Each GPU node has single
4150-
AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
4149+
<DESC>Chicoma GPU nodes at LANL IC. Each GPU node has single AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
41514150
<NODENAME_REGEX>ch-fe*</NODENAME_REGEX>
41524151
<OS>Linux</OS>
41534152
<COMPILERS>gnugpu,gnu,nvidiagpu,nvidia</COMPILERS>
@@ -4157,7 +4156,7 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
41574156
<DIN_LOC_ROOT_CLMFORC>/usr/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
41584157
<DOUT_S_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/archive/$CASE</DOUT_S_ROOT>
41594158
<BASELINE_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER</BASELINE_ROOT>
4160-
<CCSM_CPRNC>/usr/projects/climate/SHARED_CLIMATE/software/badger/cprnc</CCSM_CPRNC>
4159+
<CCSM_CPRNC>/usr/projects/e3sm/software/chicoma-cpu/cprnc</CCSM_CPRNC>
41614160
<GMAKE_J>10</GMAKE_J>
41624161
<TESTS>e3sm_developer</TESTS>
41634162
<NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
@@ -4181,11 +4180,11 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
41814180
</arguments>
41824181
</mpirun>
41834182
<module_system type="module" allow_error="true">
4184-
<init_path lang="perl">/usr/share/lmod/8.3.1/init/perl</init_path>
4183+
<init_path lang="perl">/usr/share/lmod/lmod/init/perl</init_path>
41854184
<!-- does not exist -->
4186-
<init_path lang="python">/usr/share/lmod/8.3.1/init/python</init_path>
4187-
<init_path lang="sh">/usr/share/lmod/8.3.1/init/sh</init_path>
4188-
<init_path lang="csh">/usr/share/lmod/8.3.1/init/csh</init_path>
4185+
<init_path lang="python">/usr/share/lmod/lmod/init/python</init_path>
4186+
<init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
4187+
<init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
41894188
<cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
41904189
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
41914190
<cmd_path lang="sh">module</cmd_path>
@@ -4197,32 +4196,35 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
41974196
<command name="unload">cray-parallel-netcdf</command>
41984197
<command name="unload">cray-netcdf</command>
41994198
<command name="unload">cray-hdf5</command>
4200-
<command name="unload">PrgEnv-gnu</command>
4201-
<command name="unload">PrgEnv-intel</command>
4202-
<command name="unload">PrgEnv-nvidia</command>
4203-
<command name="unload">PrgEnv-cray</command>
4204-
<command name="unload">PrgEnv-aocc</command>
42054199
<command name="unload">intel</command>
42064200
<command name="unload">intel-oneapi</command>
42074201
<command name="unload">nvidia</command>
42084202
<command name="unload">aocc</command>
42094203
<command name="unload">cudatoolkit</command>
42104204
<command name="unload">climate-utils</command>
4205+
<command name="unload">cray-libsci</command>
42114206
<command name="unload">craype-accel-nvidia80</command>
42124207
<command name="unload">craype-accel-host</command>
42134208
<command name="unload">perftools-base</command>
42144209
<command name="unload">perftools</command>
42154210
<command name="unload">darshan</command>
4211+
<command name="unload">PrgEnv-gnu</command>
4212+
<command name="unload">PrgEnv-intel</command>
4213+
<command name="unload">PrgEnv-nvidia</command>
4214+
<command name="unload">PrgEnv-cray</command>
4215+
<command name="unload">PrgEnv-aocc</command>
42164216
</modules>
42174217

42184218
<modules compiler="gnu.*">
4219-
<command name="load">PrgEnv-gnu/8.4.0</command>
4220-
<command name="load">gcc/11.2.0</command>
4219+
<command name="load">PrgEnv-gnu/8.5.0</command>
4220+
<command name="load">gcc/12.2.0</command>
4221+
<command name="load">cray-libsci/23.05.1.4</command>
42214222
</modules>
42224223

42234224
<modules compiler="nvidia.*">
42244225
<command name="load">PrgEnv-nvidia/8.4.0</command>
42254226
<command name="load">nvidia/22.7</command>
4227+
<command name="load">cray-libsci/23.05.1.4</command>
42264228
</modules>
42274229

42284230
<modules compiler="gnugpu">
@@ -4245,14 +4247,13 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
42454247
</modules>
42464248

42474249
<modules>
4248-
<command name="load">cray-libsci/23.05.1.4</command>
4250+
<command name="load">craype-accel-host</command>
42494251
<command name="load">craype/2.7.21</command>
42504252
<command name="load">cray-mpich/8.1.26</command>
4251-
<command name="load">libfabric/1.15.2.0</command>
42524253
<command name="load">cray-hdf5-parallel/1.12.2.3</command>
42534254
<command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
42544255
<command name="load">cray-parallel-netcdf/1.12.3.3</command>
4255-
<command name="load">cmake/3.25.1</command>
4256+
<command name="load">cmake/3.27.7</command>
42564257
</modules>
42574258
</module_system>
42584259

@@ -4275,6 +4276,9 @@ AMD EPYC 7713 64-Core (Milan) (256GB) and 4 nvidia A100'</DESC>
42754276
<env name="PNETCDF_PATH">$ENV{CRAY_PARALLEL_NETCDF_PREFIX}</env>
42764277
<env name="PKG_CONFIG_PATH">/usr/projects/e3sm/cudatoolkit:$ENV{PKG_CONFIG_PATH}</env>
42774278
</environment_variables>
4279+
<environment_variables compiler="gnu">
4280+
<env name="LD_LIBRARY_PATH">/opt/cray/pe/gcc/12.2.0/snos/lib64:$ENV{LD_LIBRARY_PATH}</env>
4281+
</environment_variables>
42784282
<resource_limits>
42794283
<resource name="RLIMIT_STACK">-1</resource>
42804284
</resource_limits>

0 commit comments

Comments
 (0)