Merge remote-tracking branch 'upstream/bartgol/eamxx/snl-gh-container…

…s' into bartgol/add-ghci-mach

components/eamxx/cmake/machine-files/ghci-cuda.cmake

@@ -0,0 +1,10 @@
+# Common settings for our ghci images
+include(${CMAKE_CURRENT_LIST_DIR}/ghci.cmake)
+
+# Set SCREAM_MACHINE
+set(SCREAM_MACHINE ghci-openmp CACHE STRING "")
+
+# Set OpenMP backend
+set(EKAT_MACH_FILES_PATH ${CMAKE_CURRENT_LIST_DIR}/../../../../externals/ekat/cmake/machine-files)
+include (${EKAT_MACH_FILES_PATH}/kokkos/cuda.cmake)
+include (${EKAT_MACH_FILES_PATH}/kokkos/nvidia-v100.cmake)

components/eamxx/cmake/machine-files/ghci-openmp.cmake

@@ -0,0 +1,9 @@
+# Common settings for our ghci images
+include(${CMAKE_CURRENT_LIST_DIR}/ghci.cmake)
+
+# Set SCREAM_MACHINE
+set(SCREAM_MACHINE ghci-openmp CACHE STRING "")
+
+# Set OpenMP backend
+set(EKAT_MACH_FILES_PATH ${CMAKE_CURRENT_LIST_DIR}/../../../../externals/ekat/cmake/machine-files)
+include (${EKAT_MACH_FILES_PATH}/kokkos/openmp.cmake)

components/eamxx/cmake/machine-files/ghci-serial.cmake

@@ -0,0 +1,9 @@
+# Common settings for our ghci images
+include(${CMAKE_CURRENT_LIST_DIR}/ghci.cmake)
+
+# Set SCREAM_MACHINE
+set(SCREAM_MACHINE ghci-serial CACHE STRING "")
+
+# Set OpenMP backend
+set(EKAT_MACH_FILES_PATH ${CMAKE_CURRENT_LIST_DIR}/../../../../externals/ekat/cmake/machine-files)
+include (${EKAT_MACH_FILES_PATH}/kokkos/serial.cmake)

components/eamxx/cmake/machine-files/ghci.cmake

@@ -0,0 +1,12 @@
+# Set Fortran flags
+set(CMAKE_Fortran_FLAGS "-fallow-argument-mismatch" CACHE STRING "Fortran compiler flags" FORCE)
+
+# Set the path to SCREAM input data
+set(SCREAM_INPUT_ROOT /projects/e3sm/inputdata CACHE PATH "Path to SCREAM input data" FORCE)
+
+# Set the path to BLAS/LAPACK libraries
+set(BLAS_LIBRARIES "/spack-installs/netlib-lapack/3.11.0/gcc/12.3.0/base/65x6uge/lib64/libblas.so" CACHE STRING "Path to BLAS library" FORCE)
+set(LAPACK_LIBRARIES "/spack-installs/netlib-lapack/3.11.0/gcc/12.3.0/base/65x6uge/lib64/liblapack.so" CACHE STRING "Path to LAPACK library" FORCE)
+
+# Let's catch usage of code deprecated in Kokkos 4
+option (Kokkos_ENABLE_DEPRECATED_CODE_4 "" OFF)

components/eamxx/scripts/machines_specs.py

@@ -93,6 +93,19 @@
     "linux-generic" :        ([],["mpicxx","mpifort","mpicc"],"", ""),
     "linux-generic-debug" :  ([],["mpicxx","mpifort","mpicc"],"", ""),
     "linux-generic-serial" : ([],["mpicxx","mpifort","mpicc"],"", ""),
+
+    "ghci-serial" : ([],
+                     ["mpicxx","mpifort","mpicc"],
+                      "",
+                      "/projects/e3sm/baselines"),
+    "ghci-openmp" : ([],
+                     ["mpicxx","mpifort","mpicc"],
+                      "",
+                      "/projects/e3sm/baselines"),
+    "ghci-cuda" : ([],
+                   ["mpicxx","mpifort","mpicc"],
+                    "",
+                    "/projects/e3sm/baselines"),
 }
 
 if pathlib.Path("~/.cime/scream_mach_specs.py").expanduser().is_file(): # pylint: disable=no-member
@@ -232,6 +245,9 @@ def is_cuda_machine(machine):
 ###############################################################################
     assert_machine_supported(machine)
 
+    if machine=="ghci-cuda":
+        return True
+
     env_setup_raw = MACHINE_METADATA[machine][0]
     env_setup_str = " ".join(env_setup_raw)