Merge pull request #2915 from E3SM-Project/dqwu/frontier-071924

Frontier: Post-maintenance updates.
E3SM-Project · Jul 30, 2024 · 5434820 · 5434820
1 parent 27b21e2
commit 5434820
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/cime_config/machines/cmake_macros/crayclang-scream_frontier-scream-gpu.cmake b/cime_config/machines/cmake_macros/crayclang-scream_frontier-scream-gpu.cmake
@@ -19,7 +19,7 @@ endif()
 
 string(APPEND CMAKE_Fortran_FLAGS " -hipa0 -hzero -f free")
 
-string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64")
+string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64 -L/opt/gcc/12.2.0/snos/lib64")
 string(APPEND CMAKE_CXX_FLAGS " -I$ENV{ROCM_PATH}/include")
 
 # Crusher: this resolves a crash in mct in docn init

diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -1444,6 +1444,8 @@
         <command name="load">PrgEnv-cray</command>
         <command name="load">craype-accel-amd-gfx90a</command>
         <command name="load">rocm/5.4.0</command>
+        <command name="load">ums/default</command>
+        <command name="load">ums002/default</command>
         <command name="load">libunwind/1.6.2</command>
       </modules>
       <modules>

diff --git a/components/eamxx/src/share/io/scream_scorpio_types.hpp b/components/eamxx/src/share/io/scream_scorpio_types.hpp
@@ -5,6 +5,7 @@
 #include <map>
 #include <vector>
 #include <memory>
+#include <cstdint>
 
 namespace scream {
 namespace scorpio {