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

Use CMake variables/names in our cmake macros #6014

Merged
merged 46 commits into from
Nov 15, 2023
Merged

Use CMake variables/names in our cmake macros #6014

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
33b76e7
Theta doesn't need to manually set netcdf slibs
jgfouca Oct 23, 2023
08b9bf6
Restructure intel_anvil macro to be more parseable
jgfouca Oct 23, 2023
3134589
Make nag.cmake more parseable
jgfouca Oct 23, 2023
c0a92a2
Not sure we keep this
jgfouca Oct 23, 2023
ffb4480
Make pgi_ascent more parseable
jgfouca Oct 23, 2023
52d0a52
Clean up CXX_LINKER stuff a bit
jgfouca Oct 23, 2023
86333ee
Remove FC_AUTO_R8 from macros, it wasn't being used for anything
jgfouca Oct 23, 2023
0fd792d
The SUPPORTS_CXX concept was adding no value
jgfouca Oct 23, 2023
7695869
Add macro converter script
jgfouca Oct 23, 2023
cb4eb27
Better handling of cuda/hip flags
jgfouca Oct 23, 2023
2fb7b18
Remove instances of ZLIB and SLIB PATH in macros
jgfouca Oct 23, 2023
0e4e417
Add post_process step to macros to set final compilers
jgfouca Oct 24, 2023
fce4c7e
Clean up crayclang-scream-gpu a bit
jgfouca Oct 24, 2023
78c1438
Merge CXX_LDFLAGS and CXX_LIBS; they are the same concept
jgfouca Oct 24, 2023
0d902f5
Various cleans and fixes
jgfouca Oct 24, 2023
d1bbc7a
mct and mpi-serial need to look at CONFIG_ARGS from macros
jgfouca Oct 24, 2023
f4ee575
Bit more cleanup
jgfouca Oct 24, 2023
7b28bad
Clean up HAS_F2008_CONTIGUOUS a bit
jgfouca Oct 25, 2023
4cf71b7
Remove CXX_LINKER and CXX_LIBS
jgfouca Oct 25, 2023
809525f
Stop micromanaging linker
jgfouca Oct 25, 2023
dfe1ade
First attempt to convert macros
jgfouca Oct 25, 2023
1107d6b
Progress
jgfouca Oct 27, 2023
f76c5f8
Progress
jgfouca Oct 27, 2023
7f9228a
Merge remote-tracking branch 'origin/master' into jgfouca/cmake_names…
jgfouca Oct 27, 2023
7f5b078
Clean up some logic in build_model
jgfouca Oct 30, 2023
f2e04d4
Updating compare-flags to look at logs
jgfouca Oct 30, 2023
18b455d
Fixes for using cmake vars
jgfouca Oct 31, 2023
5330bd8
Better way to handle free/fixed fortran
jgfouca Oct 31, 2023
198c7b8
Fixes for free/fixed and macro exp
jgfouca Oct 31, 2023
cdfebee
Clean up deoptimization a bit
jgfouca Oct 31, 2023
9e6f04e
Remove FFLAGS_NOOPT concept
jgfouca Oct 31, 2023
81d80e0
Cleanup kokkos sharedlib build wrapper
jgfouca Oct 31, 2023
3af01f9
Revert "Not sure we keep this"
jgfouca Oct 31, 2023
a4c868a
More fixes to buildlib.kokkos and post_process.cmake needs to not blo…
jgfouca Nov 1, 2023
73b395a
More fixes to sharedlibs
jgfouca Nov 1, 2023
253dd26
We haven't used Makefiles to build cosp in years
jgfouca Nov 1, 2023
94d6a36
Remove last uses of e3sm_remove_flag in Depends files
jgfouca Nov 1, 2023
8771928
Turn on verbose makefiles for gptl
jgfouca Nov 1, 2023
4d44ecd
gptl build fixes
jgfouca Nov 1, 2023
19bd6d5
Allow fortran linking if we have to
jgfouca Nov 3, 2023
435ce72
Merge remote-tracking branch 'origin/master' into jgfouca/cmake_names…
jgfouca Nov 3, 2023
fe1b459
Fixes for pgi
jgfouca Nov 3, 2023
bc35c3b
Fixes for fortran linking
jgfouca Nov 3, 2023
6def04a
Merge remote-tracking branch 'origin/master' into jgfouca/cmake_names…
jgfouca Nov 9, 2023
42c41fc
Merge remote-tracking branch 'origin/master' into jgfouca/cmake_names…
jgfouca Nov 14, 2023
10f1bac
Update upstream macros
jgfouca Nov 14, 2023
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
8 changes: 1 addition & 7 deletions cime_config/customize/e3sm_compile_wrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ def run_cmd(args):

arglen = len(args)
target = None
for (
idx,
arg,
) in enumerate(args):
for idx, arg in enumerate(args):
if arg == "-o" and idx + 1 < arglen:
target = args[idx + 1]
break
Expand All @@ -41,13 +38,11 @@ def run_cmd(args):

return result


###############################################################################
def parse_command_line(args, _):
###############################################################################
return args[1:]


###############################################################################
def _main_func(description):
###############################################################################
Expand All @@ -57,7 +52,6 @@ def _main_func(description):

sys.exit(result)


###############################################################################

if __name__ == "__main__":
Expand Down
4 changes: 0 additions & 4 deletions cime_config/machines/Depends.pm-cpu.alvarez.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@ if (NOT DEBUG)
e3sm_remove_flags("${ITEM}" "-O")
endforeach()
endif()




2 changes: 1 addition & 1 deletion cime_config/machines/cmake_macros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_policy(SET CMP0057 NEW)
cmake_minimum_required(VERSION 3.5)
project(cime LANGUAGES C Fortran)
include(../Macros.cmake)
include(${CMAKE_CURRENT_BINARY_DIR}/../Macros.cmake)
23 changes: 19 additions & 4 deletions cime_config/machines/cmake_macros/Macros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,19 @@ set(UNIVERSAL_MACRO ${MACROS_DIR}/universal.cmake)
set(COMPILER_MACRO ${MACROS_DIR}/${COMPILER}.cmake)
set(MACHINE_MACRO ${MACROS_DIR}/${MACH}.cmake)
set(COMPILER_MACHINE_MACRO ${MACROS_DIR}/${COMPILER}_${MACH}.cmake)
set(POST_PROCESS_MACRO ${SRCROOT}/cime_config/machines/cmake_macros/post_process.cmake)

if (CONVERT_TO_MAKE)
get_cmake_property(VARS_BEFORE_BUILD_INTERNAL_IGNORE VARIABLES)
get_cmake_property(E3SM_CMAKE_INTERNAL_VARS_BEFORE_BUILD_INTERNAL_IGNORE VARIABLES)
foreach (VAR_BEFORE IN LISTS E3SM_CMAKE_INTERNAL_VARS_BEFORE_BUILD_INTERNAL_IGNORE)
set("E3SM_CMAKE_INTERNAL_${VAR_BEFORE}" "${${VAR_BEFORE}}")
endforeach()
list(APPEND E3SM_CMAKE_INTERNAL_VARS_BEFORE_BUILD_INTERNAL_IGNORE "VAR_BEFORE")
list(APPEND E3SM_CMAKE_INTERNAL_VARS_BEFORE_BUILD_INTERNAL_IGNORE "MACRO_FILE")
endif()

# Include order defines precedence
foreach (MACRO_FILE ${UNIVERSAL_MACRO} ${COMPILER_MACRO} ${MACHINE_MACRO} ${COMPILER_MACHINE_MACRO})
foreach (MACRO_FILE ${UNIVERSAL_MACRO} ${COMPILER_MACRO} ${MACHINE_MACRO} ${COMPILER_MACHINE_MACRO} ${POST_PROCESS_MACRO})
if (EXISTS ${MACRO_FILE})
include(${MACRO_FILE})
else()
Expand All @@ -30,8 +36,17 @@ if (CONVERT_TO_MAKE)
get_cmake_property(VARS_AFTER VARIABLES)

foreach (VAR_AFTER IN LISTS VARS_AFTER)
if (NOT VAR_AFTER IN_LIST VARS_BEFORE_BUILD_INTERNAL_IGNORE)
message("CIME_SET_MAKEFILE_VAR ${VAR_AFTER} := ${${VAR_AFTER}}")
if (VAR_AFTER MATCHES "^E3SM_CMAKE_INTERNAL_")
# skip
else()
if (NOT VAR_AFTER IN_LIST E3SM_CMAKE_INTERNAL_VARS_BEFORE_BUILD_INTERNAL_IGNORE)
message("CIME_SET_MAKEFILE_VAR ${VAR_AFTER} := ${${VAR_AFTER}}")
list(APPEND E3SM_CMAKE_INTERNAL_VARS_BEFORE_BUILD_INTERNAL_IGNORE "${VAR_AFTER}")
set("E3SM_CMAKE_INTERNAL_${VAR_AFTER}" "${${VAR_AFTER}}")
elseif (NOT "${${VAR_AFTER}}" STREQUAL "${E3SM_CMAKE_INTERNAL_${VAR_AFTER}}")
message("CIME_SET_MAKEFILE_VAR ${VAR_AFTER} := ${${VAR_AFTER}}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these messages supposed to stay, or are they here just for debugging purposes while you are doing the port?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They need to stay. This hacky stuff is how we translate processed cmake macros into Makefile macros. Nothing we have is using the Makefile macros directly anymore, but they are still useful for querying macro vars which we do in a few places when "crossing" build systems (cmake -> autoconf for example) in some of the sharelib builds.

set("E3SM_CMAKE_INTERNAL_${VAR_AFTER}" "${${VAR_AFTER}}")
endif()
endif()
endforeach()
endif()
24 changes: 9 additions & 15 deletions cime_config/machines/cmake_macros/amdclang.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
if (DEBUG)
string(APPEND CFLAGS " -O0 -g")
string(APPEND FFLAGS " -O0 -g")
string(APPEND CXXFLAGS " -O0 -g")
string(APPEND CPPDEFS " -DYAKL_DEBUG")
endif()
string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g")
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g")
string(APPEND CPPDEFS_DEBUG " -DYAKL_DEBUG")
if (compile_threaded)
string(APPEND FFLAGS " -fopenmp")
string(APPEND CFLAGS " -fopenmp")
string(APPEND CXXFLAGS " -fopenmp")
string(APPEND LDFLAGS " -fopenmp")
string(APPEND CMAKE_Fortran_FLAGS " -fopenmp")
string(APPEND CMAKE_C_FLAGS " -fopenmp")
string(APPEND CMAKE_CXX_FLAGS " -fopenmp")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
endif()
string(APPEND CPPDEFS " -DNO_R16 -DCPRAMD -DFORTRANUNDERSCORE")
string(APPEND FFLAGS_NOOPT " -O0")
set(HAS_F2008_CONTIGUOUS "FALSE")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0")
set(MPICC "cc")
set(MPICXX "CC")
set(MPIFC "ftn")
set(SUPPORTS_CXX "TRUE")
set(CXX_LINKER "FORTRAN")
string(APPEND CXX_LIBS " -lstdc++")
23 changes: 8 additions & 15 deletions cime_config/machines/cmake_macros/amdclang_alvarez.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY")
endif()
if (NOT DEBUG)
string(APPEND CFLAGS " -O2 -g")
string(APPEND CXXFLAGS " -O2 -g")
string(APPEND FFLAGS " -O2 -g")
endif()
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -g")
#string(APPEND FFLAGS " -march=znver3")
set(SCC "clang")
set(SCXX "clang++")
set(SFC "flang")

if (COMP_NAME STREQUAL cism)
string(APPEND CMAKE_OPTS " -D CISM_GNU=ON")
endif()

string(APPEND FC_AUTO_R8 " -fdefault-real-8")
string(APPEND FFLAGS " -Mflushz ")
string(APPEND FIXEDFLAGS " -Mfixed")
string(APPEND FREEFLAGS " -Mfreeform")
string(APPEND CMAKE_Fortran_FLAGS " -Mflushz ")
string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -Mfixed")
string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -Mfreeform")
if (compile_threaded)
string(APPEND FFLAGS " -mp")
string(APPEND LDFLAGS " -mp")
string(APPEND CMAKE_Fortran_FLAGS " -mp")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -mp")
endif()
23 changes: 8 additions & 15 deletions cime_config/machines/cmake_macros/amdclang_chicoma-cpu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,18 @@ if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY")
endif()
set(PIO_FILESYSTEM_HINTS "lustre")
if (NOT DEBUG)
string(APPEND CFLAGS " -O2 -g")
string(APPEND CXXFLAGS " -O2 -g")
string(APPEND FFLAGS " -O2")
endif()
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
#string(APPEND FFLAGS " -march=znver3")
set(SCC "clang")
set(SCXX "clang++")
set(SFC "flang")

if (COMP_NAME STREQUAL cism)
string(APPEND CMAKE_OPTS " -D CISM_GNU=ON")
endif()

string(APPEND FC_AUTO_R8 " -fdefault-real-8")
string(APPEND FFLAGS " -Mflushz ")
string(APPEND FIXEDFLAGS " -Mfixed")
string(APPEND FREEFLAGS " -Mfreeform")
string(APPEND CMAKE_Fortran_FLAGS " -Mflushz ")
string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -Mfixed")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. This is a CMake supported/handled variable, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I think CMake can probably handle this automatically but I'm not 100% on that so I kept it.

string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -Mfreeform")
if (compile_threaded)
string(APPEND FFLAGS " -mp")
string(APPEND LDFLAGS " -mp")
string(APPEND CMAKE_Fortran_FLAGS " -mp")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -mp")
endif()
3 changes: 1 addition & 2 deletions cime_config/machines/cmake_macros/amdclang_crusher.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ string(APPEND CPPDEFS " -DLINUX")
if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
endif()
string(APPEND SLIBS " -L$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib -lsci_amd")
set(CRAY_LIBSCI_PREFIX_DIR "$ENV{CRAY_LIBSCI_PREFIX_DIR}")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib -lsci_amd")
3 changes: 1 addition & 2 deletions cime_config/machines/cmake_macros/amdclang_frontier.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ string(APPEND CPPDEFS " -DLINUX")
if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
endif()
string(APPEND SLIBS " -L$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib -lsci_amd")
set(CRAY_LIBSCI_PREFIX_DIR "$ENV{CRAY_LIBSCI_PREFIX_DIR}")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib -lsci_amd")
23 changes: 8 additions & 15 deletions cime_config/machines/cmake_macros/amdclang_pm-cpu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY")
endif()
if (NOT DEBUG)
string(APPEND CFLAGS " -O2 -g")
string(APPEND CXXFLAGS " -O2 -g")
string(APPEND FFLAGS " -O2")
endif()
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2 -g")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
#string(APPEND FFLAGS " -march=znver3")
set(SCC "clang")
set(SCXX "clang++")
set(SFC "flang")

if (COMP_NAME STREQUAL cism)
string(APPEND CMAKE_OPTS " -D CISM_GNU=ON")
endif()

string(APPEND FC_AUTO_R8 " -fdefault-real-8")
string(APPEND FFLAGS " -Mflushz ")
string(APPEND FIXEDFLAGS " -Mfixed")
string(APPEND FREEFLAGS " -Mfreeform")
string(APPEND CMAKE_Fortran_FLAGS " -Mflushz ")
string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -Mfixed")
string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -Mfreeform")
if (compile_threaded)
string(APPEND FFLAGS " -mp")
string(APPEND LDFLAGS " -mp")
string(APPEND CMAKE_Fortran_FLAGS " -mp")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -mp")
endif()
24 changes: 9 additions & 15 deletions cime_config/machines/cmake_macros/amdclanggpu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
if (DEBUG)
string(APPEND CFLAGS " -O0 -g")
string(APPEND FFLAGS " -O0 -g")
string(APPEND CXXFLAGS " -O0 -g")
string(APPEND CPPDEFS " -DYAKL_DEBUG")
endif()
string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g")
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g")
string(APPEND CPPDEFS_DEBUG " -DYAKL_DEBUG")
if (compile_threaded)
string(APPEND FFLAGS " -fopenmp")
string(APPEND CFLAGS " -fopenmp")
string(APPEND CXXFLAGS " -fopenmp")
string(APPEND LDFLAGS " -fopenmp")
string(APPEND CMAKE_Fortran_FLAGS " -fopenmp")
string(APPEND CMAKE_C_FLAGS " -fopenmp")
string(APPEND CMAKE_CXX_FLAGS " -fopenmp")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
endif()
string(APPEND CPPDEFS " -DNO_R16 -DCPRAMD -DFORTRANUNDERSCORE")
string(APPEND FFLAGS_NOOPT " -O0")
set(HAS_F2008_CONTIGUOUS "FALSE")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0")
set(MPICC "cc")
set(MPICXX "CC")
set(MPIFC "ftn")
set(SCC "cc")
set(SCXX "CC")
set(SFC "ftn")
set(SUPPORTS_CXX "TRUE")
set(CXX_LINKER "FORTRAN")
string(APPEND CXX_LIBS " -lstdc++")
18 changes: 8 additions & 10 deletions cime_config/machines/cmake_macros/amdclanggpu_crusher.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@ string(APPEND CPPDEFS " -DLINUX")
if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
endif()
if (NOT DEBUG)
string(APPEND CFLAGS " -O2")
string(APPEND CXXFLAGS " -O2")
string(APPEND FFLAGS " -O2")
endif()
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")

string(APPEND CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")
string(APPEND SLIBS " -L$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib -lsci_amd")
string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib -lsci_amd")

set(MPICXX "hipcc")
set(SCXX "hipcc")
string(APPEND CXXFLAGS " -I$ENV{MPICH_DIR}/include --offload-arch=gfx90a")
string(APPEND SLIBS " -L$ENV{MPICH_DIR}/lib -lmpi -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
string(APPEND CMAKE_CXX_FLAGS " -I$ENV{MPICH_DIR}/include --offload-arch=gfx90a")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{MPICH_DIR}/lib -lmpi -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_HIP=On -DKokkos_ARCH_ZEN3=On -DKokkos_ARCH_VEGA90A=On")

set(USE_HIP "TRUE")
string(APPEND HIP_FLAGS "${CXXFLAGS} -munsafe-fp-atomics -x hip")
string(APPEND CMAKE_HIP_FLAGS "${CXXFLAGS} -munsafe-fp-atomics -x hip")
18 changes: 8 additions & 10 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 @@ -9,20 +9,18 @@ string(APPEND CPPDEFS " -DLINUX")
if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
endif()
if (NOT DEBUG)
string(APPEND CFLAGS " -O2")
string(APPEND CXXFLAGS " -O2")
string(APPEND FFLAGS " -O2")
endif()
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")

string(APPEND CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")
string(APPEND SLIBS " -L$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib -lsci_amd")
string(APPEND SPIO_CMAKE_OPTS " -DPIO_ENABLE_TOOLS:BOOL=OFF")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib -lsci_amd")

set(MPICXX "hipcc")
set(SCXX "hipcc")
string(APPEND CXXFLAGS " -I$ENV{MPICH_DIR}/include --offload-arch=gfx90a")
string(APPEND SLIBS " -L$ENV{MPICH_DIR}/lib -lmpi -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
string(APPEND CMAKE_CXX_FLAGS " -I$ENV{MPICH_DIR}/include --offload-arch=gfx90a")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{MPICH_DIR}/lib -lmpi -L$ENV{CRAY_MPICH_ROOTDIR}/gtl/lib -lmpi_gtl_hsa")
string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_HIP=On -DKokkos_ARCH_ZEN3=On -DKokkos_ARCH_VEGA90A=On")

set(USE_HIP "TRUE")
string(APPEND HIP_FLAGS "${CXXFLAGS} -munsafe-fp-atomics -x hip")
string(APPEND CMAKE_HIP_FLAGS "${CXXFLAGS} -munsafe-fp-atomics -x hip")
25 changes: 9 additions & 16 deletions cime_config/machines/cmake_macros/cray.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
if (compile_threaded)
string(APPEND CFLAGS " -h omp")
endif()
if (DEBUG)
string(APPEND CFLAGS " -g -O0")
string(APPEND CMAKE_C_FLAGS " -h omp")
endif()
string(APPEND CMAKE_C_FLAGS_DEBUG " -g -O0")
string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRCRAY")
string(APPEND FC_AUTO_R8 " -s real64")
string(APPEND FFLAGS " -f free -em")
string(APPEND CMAKE_Fortran_FLAGS " -f free -em")
if (compile_threaded)
string(APPEND FFLAGS " -h omp")
string(APPEND CMAKE_Fortran_FLAGS " -h omp")
endif()
if (NOT compile_threaded)
string(APPEND FFLAGS " -M1077")
endif()
if (DEBUG)
string(APPEND FFLAGS " -g -O0")
string(APPEND CMAKE_Fortran_FLAGS " -M1077")
endif()
string(APPEND FFLAGS_NOOPT " -O0")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -g -O0")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0")
set(HAS_F2008_CONTIGUOUS "TRUE")
string(APPEND LDFLAGS " -Wl,--allow-multiple-definition")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,--allow-multiple-definition")
if (compile_threaded)
string(APPEND LDFLAGS " -h omp")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -h omp")
endif()
set(SUPPORTS_CXX "TRUE")
set(CXX_LINKER "FORTRAN")
19 changes: 6 additions & 13 deletions cime_config/machines/cmake_macros/cray_theta.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
if (NOT DEBUG)
string(APPEND CFLAGS " -O1")
string(APPEND FFLAGS " -O1")
endif()
string(APPEND CMAKE_C_FLAGS_RELEASE " -O1")
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O1")
if (COMP_NAME STREQUAL eam)
string(APPEND FFLAGS " -vector0")
string(APPEND CMAKE_Fortran_FLAGS " -vector0")
endif()
set(CXX_LINKER "CXX")
string(APPEND KOKKOS_OPTIONS " -DKokkos_INTERNAL_GCC_TOOLCHAIN=/opt/gcc/9.3.0/snos")
if (compile_threaded)
string(APPEND CXXFLAGS " -fopenmp")
endif()
if (DEBUG)
string(APPEND CXXFLAGS " -g -Wall")
endif()
if (NOT DEBUG)
string(APPEND CXXFLAGS " -O1")
string(APPEND CMAKE_CXX_FLAGS " -fopenmp")
endif()
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -g -Wall")
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O1")
Loading