Skip to content

Commit dba1054

Browse files
committed
Changed Frontier build to use OpenMP and Adios2.
1 parent ea64036 commit dba1054

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

cime_config/machines/cmake_macros/craygnu-hipcc.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,17 @@ endif()
2525
string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -ffixed-form")
2626
string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -ffree-form")
2727

28-
string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")
29-
3028
set(E3SM_LINK_WITH_FORTRAN "TRUE")
3129
string(APPEND CMAKE_CXX_FLAGS " -I$ENV{MPICH_DIR}/include")
3230
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64")
3331

32+
if (compile_threaded)
33+
string(APPEND CMAKE_C_FLAGS " -fopenmp")
34+
string(APPEND CMAKE_Fortran_FLAGS " -fopenmp")
35+
string(APPEND CMAKE_CXX_FLAGS " -fopenmp=libgomp")
36+
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
37+
endif()
38+
3439
string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_HIP=On -DKokkos_ARCH_ZEN3=On -DKokkos_ARCH_VEGA90A=On -DKokkos_ENABLE_OPENMP=Off")
3540

3641
set(USE_HIP "TRUE")

cime_config/machines/config_machines.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,8 +1176,8 @@
11761176
<env name="OMP_PLACES">threads</env>
11771177
</environment_variables>
11781178

1179-
<environment_variables compiler="crayclang-scream" mpilib="mpich">
1180-
<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.26/crayclang-scream-14.0.0; else echo "$ADIOS2_ROOT"; fi}</env>
1179+
<environment_variables compiler="craygnu-hipcc" mpilib="mpich">
1180+
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /sw/frontier/spack-envs/cpe24.07-gpu/opt/gcc-13.2/adios2-2.10.0-cyq7kvlfq5nixmw5unih2gjdkhvitava; else echo "$ADIOS2_ROOT"; fi}</env>
11811181
</environment_variables>
11821182
</machine>
11831183

0 commit comments

Comments
 (0)