Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update machine and compiler files for Frontier (Nov. 2024) #6747

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Update machine and compiler files for Frontier (Nov. 2024) #6747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cime_config/machines/cmake_macros/amdclanggpu_frontier.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")

string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")

string(APPEND CMAKE_CXX_FLAGS " --offload-arch=gfx90a")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L/opt/cray/pe/gcc/12.2.0/snos/lib64 -lgfortran -lstdc++")
Expand Down
2 changes: 0 additions & 2 deletions cime_config/machines/cmake_macros/crayclanggpu_frontier.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ endif()
# https://github.com/E3SM-Project/E3SM/pull/5208
string(APPEND CMAKE_Fortran_FLAGS " -hipa0 -hzero -em -ef -hnoacc")

string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")

string(APPEND CMAKE_CXX_FLAGS " --offload-arch=gfx90a")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64")
Expand Down
1 change: 0 additions & 1 deletion cime_config/machines/cmake_macros/gnugpu_frontier.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ string(APPEND CMAKE_Fortran_FLAGS " -Wno-implicit-interface")
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")

string(APPEND CMAKE_CXX_FLAGS " --offload-arch=gfx90a")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
Expand Down
11 changes: 4 additions & 7 deletions cime_config/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
<modules compiler="crayclang.*">
<command name="reset"></command>
<command name="switch">Core/24.07</command>
<command name="switch">Core Core/24.07</command>
<command name="switch">PrgEnv-cray PrgEnv-cray/8.3.3</command>
<command name="switch">cce cce/15.0.1</command>
<!-- craype module to address tcmalloc runtime errors at startup -->
Expand All @@ -1082,7 +1082,7 @@
</modules>
<modules compiler="amdclang.*">
<command name="reset"></command>
<command name="switch">Core/24.07</command>
<command name="switch">Core Core/24.07</command>
<command name="switch">PrgEnv-cray PrgEnv-amd/8.3.3</command>
<command name="switch">amd amd/5.4.0</command>
</modules>
Expand All @@ -1091,7 +1091,7 @@
</modules>
<modules compiler="gnu.*">
<command name="reset"></command>
<command name="switch">Core/24.07</command>
<command name="switch">Core Core/24.07</command>
<command name="switch">PrgEnv-cray PrgEnv-gnu/8.3.3</command>
<command name="switch">gcc gcc/12.2.0</command>
</modules>
Expand All @@ -1106,6 +1106,7 @@
<command name="load">subversion</command>
<command name="load">git</command>
<command name="load">zlib</command>
<command name="load">libfabric/1.15.2.0</command>
<command name="load">cray-hdf5-parallel/1.12.2.1</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.1</command>
<command name="load">cray-parallel-netcdf/1.12.3.1</command>
Expand Down Expand Up @@ -1139,9 +1140,6 @@
<env name="OMP_PROC_BIND">spread</env>
<env name="OMP_PLACES">threads</env>
</environment_variables>
<!--
commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" issue is resolved.

<environment_variables compiler="gnu.*" mpilib="mpich">
<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>
</environment_variables>
Expand All @@ -1151,7 +1149,6 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
<environment_variables compiler="amdclang.*" mpilib="mpich">
<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>
</environment_variables>
-->
</machine>

<machine MACH="frontier-scream-gpu">
Expand Down
Loading