-
Notifications
You must be signed in to change notification settings - Fork 371
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jgfouca/scream_downstream_2024_10_09' into next (PR #6675)
Scream downstream merge 2024_10_09 [BFB] * jgfouca/scream_downstream_2024_10_09: (471 commits) Simply call to new abort feature in the AD code better comment Use asynchronous deep_copy in non-contig sync_views_impl Change the name of fail option to be self-descriptive EAMxx: allow non-contiguous set of cpus in test-all-scream Change sync_views_impl to use scratch contiguous field Pass data_type to other subfield impl Make deep_copy const Create contiguous helper field Add function to return if host == device mem space A quick change to recreate an aborted run mid simulation Update rrtmgp to latest kokkos-coversion-branch Remove most allocations from rrtmgp interface Try async deep copy for sync to host EAMxx: fix usage of regex when parsing rpointer file EAMxx: fix nc file names in some standalone tests EAMxx: fix usage of layout extents in field methods Consolidate sync_to_host_impl and sync_to_device_impl into sync_views_impl Add comment on need for mutable m_is_read_only Allow sync_to_host for read-only fields ...
- Loading branch information
Showing
312 changed files
with
12,445 additions
and
4,612 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
cime_config/machines/cmake_macros/amdclanggpu_crusher.cmake
This file was deleted.
Oops, something went wrong.
12 changes: 0 additions & 12 deletions
12
cime_config/machines/cmake_macros/crayclang-scream_crusher-scream-cpu.cmake
This file was deleted.
Oops, something went wrong.
28 changes: 0 additions & 28 deletions
28
cime_config/machines/cmake_macros/crayclang-scream_crusher-scream-gpu.cmake
This file was deleted.
Oops, something went wrong.
12 changes: 0 additions & 12 deletions
12
cime_config/machines/cmake_macros/crayclang-scream_crusher-scream.cmake
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
63 changes: 0 additions & 63 deletions
63
cime_config/machines/cmake_macros/crayclanggpu_crusher.cmake
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
set(MPICC "cc") | ||
set(MPICXX "hipcc") # Needs MPICH_CXX to use hipcc | ||
set(MPIFC "ftn") # Linker needs to be the Cray wrapper ftn, not mpif90 | ||
set(SCC "cc") | ||
set(SCXX "hipcc") | ||
set(SFC "ftn") | ||
|
||
string(APPEND CPPDEFS " -DLINUX -DFORTRANUNDERSCORE -DNO_R16 -DCPRGNU -DSCREAM_SYSTEM_WORKAROUND_P3_PART2") | ||
if (COMP_NAME STREQUAL gptl) | ||
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY") | ||
endif() | ||
string(APPEND CMAKE_Fortran_FLAGS " -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none -fallow-argument-mismatch") | ||
|
||
string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g -Wall -fbacktrace -fcheck=bounds -ffpe-trap=invalid,zero,overflow") | ||
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -Wall -fbacktrace -fcheck=bounds -ffpe-trap=zero,overflow") | ||
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g -Wall -fbacktrace") | ||
|
||
string(APPEND CMAKE_C_FLAGS_RELEASE " -g -O2") | ||
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -g -O2") | ||
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -g -O2") | ||
|
||
if (COMP_NAME STREQUAL csm_share) | ||
string(APPEND CMAKE_C_FLAGS " -std=c99") | ||
endif() | ||
string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -ffixed-form") | ||
string(APPEND CMAKE_Fortran_FORMAT_FREE_FLAG " -ffree-form") | ||
|
||
set(E3SM_LINK_WITH_FORTRAN "TRUE") | ||
string(APPEND CMAKE_CXX_FLAGS " -I$ENV{MPICH_DIR}/include") | ||
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{ROCM_PATH}/lib -lamdhip64") | ||
|
||
if (compile_threaded) | ||
string(APPEND CMAKE_C_FLAGS " -fopenmp") | ||
string(APPEND CMAKE_Fortran_FLAGS " -fopenmp") | ||
string(APPEND CMAKE_CXX_FLAGS " -fopenmp=libgomp") | ||
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp") | ||
endif() | ||
|
||
string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_HIP=On -DKokkos_ARCH_ZEN3=On -DKokkos_ARCH_VEGA90A=On -DKokkos_ENABLE_OPENMP=Off") | ||
|
||
set(USE_HIP "TRUE") | ||
string(APPEND CMAKE_HIP_FLAGS "$ENV{CXXFLAGS} --offload-arch=gfx90a -munsafe-fp-atomics") |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.