Skip to content

Commit 5368531

Browse files
grnydawngrnydawn
committed
Merge branch 'ykim/frontier/June2026' (PR #8526)
This PR updates the Frontier machine configuration to align with the upcoming removal of ROCm 5 from the Frontier system. * Updates software modules and compiler flags for the craycray and craycray-mphipcc compilers. * Removes the crayamd and crayamd-mphipcc compilers based on recent discussions.
2 parents d2cd736 + baccc7f commit 5368531

7 files changed

Lines changed: 21 additions & 113 deletions

File tree

‎cime_config/machines/cmake_macros/crayamd-mphipcc.cmake‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎cime_config/machines/cmake_macros/crayamd.cmake‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎cime_config/machines/cmake_macros/frontier_crayamd-mphipcc.cmake‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎cime_config/machines/cmake_macros/frontier_crayamd.cmake‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎cime_config/machines/cmake_macros/frontier_craycray-mphipcc.cmake‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(SFC "ftn")
77

88
if (COMP_NAME STREQUAL gptl)
99
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
10+
string(APPEND CMAKE_C_FLAGS " -UINCLUDE_CMAKE_FCI")
1011
endif()
1112

1213
if (compile_threaded)
@@ -16,9 +17,11 @@ if (compile_threaded)
1617
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
1718
endif()
1819

20+
string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
21+
1922
string(APPEND CMAKE_Fortran_FLAGS " -hipa0 -hzero -f free")
2023
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
21-
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64 -L/opt/gcc/12.2.0/snos/lib64")
24+
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64")
2225
string(APPEND CMAKE_CXX_FLAGS " -I$ENV{ROCM_PATH}/include")
2326

2427
# Crusher: this resolves a crash in mct in docn init

‎cime_config/machines/cmake_macros/frontier_craycray.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ if (compile_threaded)
1717
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
1818
endif()
1919

20-
string(APPEND CMAKE_Fortran_FLAGS " -hipa0 -hzero -f free")
20+
string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
2121

22-
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L/opt/gcc/12.2.0/snos/lib64")
22+
string(APPEND CMAKE_Fortran_FLAGS " -hipa0 -hzero -f free")
2323

2424
# Crusher: this resolves a crash in mct in docn init
2525
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -hnoacc -hfp0 -hipa0")

‎cime_config/machines/config_machines.xml‎

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,7 @@
14831483
<DESC>Frontier. AMD EPYC 7A53 64C nodes, 128 hwthreads, 512GB DDR4, 4 MI250X GPUs.</DESC>
14841484
<NODENAME_REGEX>.*frontier.*</NODENAME_REGEX>
14851485
<OS>Linux</OS>
1486-
<COMPILERS>craygnu-mphipcc,craycray-mphipcc,crayamd-mphipcc,craygnu,craycray,crayamd</COMPILERS>
1486+
<COMPILERS>craygnu-mphipcc,craygnu,craycray-mphipcc,craycray</COMPILERS>
14871487
<MPILIBS>mpich</MPILIBS>
14881488
<PROJECT>cli115</PROJECT>
14891489
<SAVE_TIMING_DIR>/lustre/orion/proj-shared/cli115</SAVE_TIMING_DIR>
@@ -1544,40 +1544,22 @@
15441544
</modules>
15451545
<modules compiler="craycray.*">
15461546
<command name="reset"></command>
1547-
<command name="load">Core/24.00</command>
1548-
<command name="load">cpe/22.12</command>
1549-
<command name="load">cce/15.0.1</command>
1550-
<command name="load">craype/2.7.20</command>
1547+
<command name="load">Core/25.03</command>
1548+
<command name="load">PrgEnv-cray/8.7.0</command>
1549+
<command name="load">cpe/26.03</command>
1550+
<command name="load">libunwind</command>
1551+
<command name="load">cray-python</command>
1552+
<command name="load">subversion</command>
1553+
<command name="load">git</command>
1554+
<command name="load">cmake</command>
1555+
<command name="load">cray-hdf5-parallel/1.14.3.9</command>
1556+
<command name="load">cray-netcdf-hdf5parallel/4.9.2.3</command>
1557+
<command name="load">cray-parallel-netcdf/1.12.3.21</command>
1558+
<command name="unload">darshan-runtime</command>
15511559
</modules>
15521560
<modules compiler="craycray-mphipcc">
15531561
<command name="load">craype-accel-amd-gfx90a</command>
1554-
<command name="load">rocm/5.4.0</command>
1555-
</modules>
1556-
<modules compiler="crayamd.*">
1557-
<command name="reset"></command>
1558-
<command name="switch">Core Core/24.00</command>
1559-
<command name="switch">PrgEnv-cray PrgEnv-amd/8.3.3</command>
1560-
<command name="switch">amd amd/5.4.0</command>
1561-
<command name="load">cray-libsci/22.12.1.1</command>
1562-
1563-
</modules>
1564-
<modules compiler="crayamd-mphipcc">
1565-
<command name="load">craype-accel-amd-gfx90a</command>
1566-
<command name="load">rocm/5.4.0</command>
1567-
</modules>
1568-
1569-
<modules compiler="^(?!craygnu).*">
1570-
<command name="load">libunwind/1.5.0</command>
1571-
<command name="load">libfabric/1.20.1</command>
1572-
<command name="load">cray-mpich/8.1.26</command>
1573-
<command name="load">cray-python/3.9.13.1</command>
1574-
<command name="load">subversion/1.14.1</command>
1575-
<command name="load">git/2.36.1</command>
1576-
<command name="load">cmake/3.21.3</command>
1577-
<command name="load">cray-hdf5-parallel/1.12.2.1</command>
1578-
<command name="load">cray-netcdf-hdf5parallel/4.9.0.1</command>
1579-
<command name="load">cray-parallel-netcdf/1.12.3.1</command>
1580-
<command name="unload">darshan-runtime</command>
1562+
<command name="load">rocm/7.2.0</command>
15811563
</modules>
15821564
</module_system>
15831565

@@ -1629,14 +1611,7 @@
16291611
<env name="MGARD_ROOT">$SHELL{if [ -z "$MGARD_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/mgard/1.5.2/craycray; else echo "$MGARD_ROOT"; fi}</env>
16301612
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/sz/2.1.12.5/craycray; else echo "$SZ_ROOT"; fi}</env>
16311613
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/zfp/1.0.1/craycray; else echo "$ZFP_ROOT"; fi}</env>
1632-
</environment_variables>
1633-
<environment_variables compiler="crayamd.*" mpilib="mpich">
1634-
<env name="PKG_CONFIG_PATH">/ccs/proj/cli115/software/frontier/3rdparty/protobuf/21.6/crayamd/lib/pkgconfig:$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}</env>
1635-
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/adios2/2.10.2/crayamd; else echo "$ADIOS2_ROOT"; fi}</env>
1636-
<env name="BLOSC2_ROOT">$SHELL{if [ -z "$BLOSC2_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/c-blosc2/2.15.2/crayamd; else echo "$BLOSC2_ROOT"; fi}</env>
1637-
<env name="MGARD_ROOT">$SHELL{if [ -z "$MGARD_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/mgard/1.5.2/crayamd; else echo "$MGARD_ROOT"; fi}</env>
1638-
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/sz/2.1.12.5/crayamd; else echo "$SZ_ROOT"; fi}</env>
1639-
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/zfp/1.0.1/crayamd; else echo "$ZFP_ROOT"; fi}</env>
1614+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /ccs/proj/cli115/software/frontier/3rdparty/moab/craymaster; else echo "$MOAB_ROOT"; fi}</env>
16401615
</environment_variables>
16411616
</machine>
16421617

0 commit comments

Comments
 (0)