Skip to content

Commit d4b7f47

Browse files
committed
Update machine and compiler files for Frontier
- Recover ADIOS support - Load libfabric/1.15.2.0 module - Fix typos in configuration files
1 parent 803fffd commit d4b7f47

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

cime_config/machines/cmake_macros/amdclanggpu_frontier.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
1313
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
1414
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
1515

16-
string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")
17-
1816
string(APPEND CMAKE_CXX_FLAGS " --offload-arch=gfx90a")
1917
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
2018
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L/opt/cray/pe/gcc/12.2.0/snos/lib64 -lgfortran -lstdc++")

cime_config/machines/cmake_macros/crayclanggpu_frontier.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ endif()
5252
# https://github.com/E3SM-Project/E3SM/pull/5208
5353
string(APPEND CMAKE_Fortran_FLAGS " -hipa0 -hzero -em -ef -hnoacc")
5454

55-
string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")
56-
5755
string(APPEND CMAKE_CXX_FLAGS " --offload-arch=gfx90a")
5856
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
5957
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64")

cime_config/machines/cmake_macros/gnugpu_frontier.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ string(APPEND CMAKE_Fortran_FLAGS " -Wno-implicit-interface")
1414
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
1515
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
1616
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
17-
string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")
1817

1918
string(APPEND CMAKE_CXX_FLAGS " --offload-arch=gfx90a")
2019
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")

cime_config/machines/config_machines.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@
10691069
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
10701070
<modules compiler="crayclang.*">
10711071
<command name="reset"></command>
1072-
<command name="switch">Core/24.07</command>
1072+
<command name="switch">Core Core/24.07</command>
10731073
<command name="switch">PrgEnv-cray PrgEnv-cray/8.3.3</command>
10741074
<command name="switch">cce cce/15.0.1</command>
10751075
<!-- craype module to address tcmalloc runtime errors at startup -->
@@ -1082,7 +1082,7 @@
10821082
</modules>
10831083
<modules compiler="amdclang.*">
10841084
<command name="reset"></command>
1085-
<command name="switch">Core/24.07</command>
1085+
<command name="switch">Core Core/24.07</command>
10861086
<command name="switch">PrgEnv-cray PrgEnv-amd/8.3.3</command>
10871087
<command name="switch">amd amd/5.4.0</command>
10881088
</modules>
@@ -1091,7 +1091,7 @@
10911091
</modules>
10921092
<modules compiler="gnu.*">
10931093
<command name="reset"></command>
1094-
<command name="switch">Core/24.07</command>
1094+
<command name="switch">Core Core/24.07</command>
10951095
<command name="switch">PrgEnv-cray PrgEnv-gnu/8.3.3</command>
10961096
<command name="switch">gcc gcc/12.2.0</command>
10971097
</modules>
@@ -1106,6 +1106,7 @@
11061106
<command name="load">subversion</command>
11071107
<command name="load">git</command>
11081108
<command name="load">zlib</command>
1109+
<command name="load">libfabric/1.15.2.0</command>
11091110
<command name="load">cray-hdf5-parallel/1.12.2.1</command>
11101111
<command name="load">cray-netcdf-hdf5parallel/4.9.0.1</command>
11111112
<command name="load">cray-parallel-netcdf/1.12.3.1</command>
@@ -1139,9 +1140,6 @@
11391140
<env name="OMP_PROC_BIND">spread</env>
11401141
<env name="OMP_PLACES">threads</env>
11411142
</environment_variables>
1142-
<!--
1143-
commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" issue is resolved.
1144-
11451143
<environment_variables compiler="gnu.*" mpilib="mpich">
11461144
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lustre/orion/cli115/world-shared/frontier/3rdparty/adios2/2.9.1/cray-mpich-8.1.23/gcc-11.2.0; else echo "$ADIOS2_ROOT"; fi}</env>
11471145
</environment_variables>
@@ -1151,7 +1149,6 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
11511149
<environment_variables compiler="amdclang.*" mpilib="mpich">
11521150
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lustre/orion/cli115/world-shared/frontier/3rdparty/adios2/2.9.1/cray-mpich-8.1.23/amdclang-15.0.0; else echo "$ADIOS2_ROOT"; fi}</env>
11531151
</environment_variables>
1154-
-->
11551152
</machine>
11561153

11571154
<machine MACH="frontier-scream-gpu">

0 commit comments

Comments
 (0)