-
Notifications
You must be signed in to change notification settings - Fork 364
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into whannah/atm/add-zon…
…al-mean-mod
- Loading branch information
Showing
80 changed files
with
3,587 additions
and
505 deletions.
There are no files selected for viewing
Submodule cime
updated
17 files
| +3 −2 | .github/workflows/testing.yml | |
| +4 −5 | CIME/SystemTests/pgn.py | |
| +4 −4 | CIME/SystemTests/tsc.py | |
| +9 −0 | CIME/Tools/jenkins_generic_job | |
| +9 −0 | CIME/Tools/wait_for_tests | |
| +1 −0 | CIME/XML/machines.py | |
| +27 −21 | CIME/bless_test_results.py | |
| +2 −2 | CIME/case/case_submit.py | |
| +2 −0 | CIME/jenkins_generic_job.py | |
| +1 −1 | CIME/non_py/cprnc | |
| +11 −0 | CIME/scripts/create_test.py | |
| +2 −0 | CIME/test_scheduler.py | |
| +11 −0 | CIME/test_status.py | |
| +9 −9 | CIME/tests/test_unit_bless_test_results.py | |
| +1 −9 | CIME/tests/test_unit_case.py | |
| +6 −0 | CIME/wait_for_tests.py | |
| +42 −42 | scripts/climate_reproducibility/README.md |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # For this file, fixes non-BFB behavior of stealth feature on pm-cpu with -O2 | ||
| set(NOOPT | ||
| eam/src/physics/cam/zm_conv.F90) | ||
|
|
||
| if (NOT DEBUG) | ||
| foreach(ITEM IN LISTS NOOPT) | ||
| e3sm_deoptimize_file("${ITEM}") | ||
| endforeach() | ||
| endif() | ||
|
|
||
|
|
||
|
|
||
|
|
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,10 @@ | ||
| list(APPEND REDUCE_OPT_LIST | ||
| homme/src/share/derivative_mod_base.F90 | ||
| ) | ||
|
|
||
| # Can use this flag to avoid internal compiler error for this file (with nvidia/21.11) | ||
| if (NOT DEBUG) | ||
| foreach(ITEM IN LISTS REDUCE_OPT_LIST) | ||
| e3sm_add_flags("${ITEM}" " -Mnovect") | ||
| endforeach() | ||
| endif() |
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,10 @@ | ||
| list(APPEND REDUCE_OPT_LIST | ||
| homme/src/share/derivative_mod_base.F90 | ||
| ) | ||
|
|
||
| # Can use this flag to avoid internal compiler error for this file (with nvidia/21.11) | ||
| if (NOT DEBUG) | ||
| foreach(ITEM IN LISTS REDUCE_OPT_LIST) | ||
| e3sm_add_flags("${ITEM}" " -Mnovect") | ||
| endforeach() | ||
| endif() |
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
|
|
||
| # compile mpas_seaice_core_interface.f90 with ifort, not ifx | ||
| e3sm_add_flags("${CMAKE_BINARY_DIR}/core_seaice/model_forward/mpas_seaice_core_interface.f90" "-fc=ifort") | ||
| if (NOT MPILIB STREQUAL "openmpi") | ||
| e3sm_add_flags("${CMAKE_BINARY_DIR}/core_seaice/model_forward/mpas_seaice_core_interface.f90" "-fc=ifort") | ||
| endif() |
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,19 @@ | ||
| string(APPEND CONFIG_ARGS " --host=cray") | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY") | ||
| endif() | ||
| string(APPEND SLIBS " -lblas -llapack") | ||
| set(CXX_LINKER "FORTRAN") | ||
| if (NOT DEBUG) | ||
| string(APPEND CFLAGS " -O2 -g") | ||
| endif() | ||
| if (NOT DEBUG) | ||
| string(APPEND FFLAGS " -O2 -g") | ||
| endif() | ||
| string(APPEND CXX_LIBS " -lstdc++") | ||
| set(MPICC "cc") | ||
| set(MPICXX "CC") | ||
| set(MPIFC "ftn") | ||
| set(SCC "gcc") | ||
| set(SCXX "g++") | ||
| set(SFC "gfortran") |
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,8 @@ | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_SLASHPROC") | ||
| endif() | ||
| string(APPEND CMAKE_C_FLAGS_RELEASE " -O2") | ||
| string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2") | ||
| set(PIO_FILESYSTEM_HINTS "gpfs") | ||
| string(APPEND SLIBS " /lcrc/group/e3sm/soft/improv/netlib-lapack/3.12.0/gcc-12.3.0/liblapack.a /lcrc/group/e3sm/soft/improv/netlib-lapack/3.12.0/gcc-12.3.0/libblas.a") | ||
|
|
20 changes: 20 additions & 0 deletions
20
cime_config/machines/cmake_macros/gnugpu_chicoma-gpu.cmake
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,20 @@ | ||
| string(APPEND CONFIG_ARGS " --host=cray") | ||
| set(USE_CUDA "TRUE") | ||
| string(APPEND CPPDEFS " -DGPU") | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY") | ||
| endif() | ||
| string(APPEND CPPDEFS " -DTHRUST_IGNORE_CUB_VERSION_CHECK") | ||
| string(APPEND SLIBS " -lblas -llapack") | ||
| string(APPEND CUDA_FLAGS " -ccbin CC -O2 -arch sm_80 --use_fast_math") | ||
| string(APPEND KOKKOS_OPTIONS " -DKokkos_ARCH_AMPERE80=On -DKokkos_ENABLE_CUDA=On -DKokkos_ENABLE_CUDA_LAMBDA=On -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=Off") | ||
| if (NOT DEBUG) | ||
| string(APPEND CFLAGS " -O2") | ||
| string(APPEND FFLAGS " -O2") | ||
| endif() | ||
| set(MPICC "cc") | ||
| set(MPICXX "CC") | ||
| set(MPIFC "ftn") | ||
| set(SCC "cc") | ||
| set(SCXX "CC") | ||
| set(SFC "ftn") |
24 changes: 24 additions & 0 deletions
24
cime_config/machines/cmake_macros/nvidia_chicoma-gpu.cmake
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,24 @@ | ||
| string(APPEND CONFIG_ARGS " --host=cray") | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY") | ||
| endif() | ||
| string(APPEND SLIBS " -lblas -llapack") | ||
| set(CXX_LINKER "FORTRAN") | ||
| if (NOT DEBUG) | ||
| string(APPEND CFLAGS " -O2") | ||
| endif() | ||
| if (NOT DEBUG) | ||
| string(APPEND CXXFLAGS " -O2") | ||
| endif() | ||
| if (NOT DEBUG) | ||
| string(APPEND FFLAGS " -O2") | ||
| endif() | ||
| if (compile_threaded) | ||
| string(APPEND KOKKOS_OPTIONS " -DKokkos_ENABLE_OPENMP=Off") # work-around for nvidia as kokkos is not passing "-mp" for threaded build | ||
| endif() | ||
| set(MPICC "cc") | ||
| set(MPICXX "CC") | ||
| set(MPIFC "ftn") | ||
| set(SCC "cc") | ||
| set(SCXX "CC") | ||
| set(SFC "ftn") |
13 changes: 13 additions & 0 deletions
13
cime_config/machines/cmake_macros/nvidiagpu_chicoma-gpu.cmake
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,13 @@ | ||
| string(APPEND CONFIG_ARGS " --host=cray") | ||
| set(USE_CUDA "TRUE") | ||
| string(APPEND CPPDEFS " -DGPU") | ||
| if (COMP_NAME STREQUAL gptl) | ||
| string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY") | ||
| endif() | ||
| string(APPEND CPPDEFS " -DTHRUST_IGNORE_CUB_VERSION_CHECK") | ||
| string(APPEND CUDA_FLAGS " -ccbin CC -O2 -arch sm_80 --use_fast_math") | ||
| string(APPEND SLIBS " -lblas -llapack") | ||
| set(CXX_LINKER "FORTRAN") | ||
| set(SCC "cc") | ||
| set(SCXX "CC") | ||
| set(SFC "ftn") |
Oops, something went wrong.