CMake updates (#2690)

* auto-enable ekat

* remove ERF_ENABLE_EKAT in cmake scripts

* rename cmake_with_kokkos

* fix hip build

* update tioga wall limit

Author: gardner48

.gitlab/LC/runners/tioga.yml

@@ -71,7 +71,7 @@ is_machine_up:
 allocate_resources:
   variables:
     GIT_STRATEGY: none
-    ALLOC_TIME: 30
+    ALLOC_TIME: 60
   extends: .on_tioga
   stage: allocate-resources
   script:

Build/cmake_with_kokkos.sh renamed to Build/cmake_mac.sh

@@ -12,6 +12,5 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
       -DERF_ENABLE_TESTS:BOOL=ON \
       -DERF_ENABLE_FCOMPARE:BOOL=ON \
       -DERF_ENABLE_DOCUMENTATION:BOOL=OFF \
-      -DERF_ENABLE_EKAT:BOOL=ON \
       -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
       .. && make -j8

Build/cmake_with_kokkos_ekat_hdf5_netcdf_fftw3_perlmutter.sh

@@ -40,9 +40,7 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=./install_erf \
       -DERF_DIM:STRING=3 \
       -DERF_ENABLE_FFT:BOOL=ON \
       -DERF_ENABLE_NETCDF:BOOL=ON \
-      -DERF_ENABLE_KOKKOS:BOOL=ON \
       -DERF_ENABLE_RRTMGP:BOOL=ON \
-      -DERF_ENABLE_EKAT:BOOL=ON \
       -DERF_ENABLE_MPI:BOOL=ON \
       -DERF_ENABLE_CUDA:BOOL=ON \
       -DAMReX_CUDA_ARCH=8.0 \

Build/cmake_with_p3.sh

@@ -8,7 +8,6 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
       -DERF_DIM:STRING=3 \
       -DERF_ENABLE_MPI:BOOL=ON \
       -DERF_ENABLE_TESTS:BOOL=ON \
-      -DERF_ENABLE_EKAT:BOOL=ON \
       -DERF_ENABLE_P3:BOOL=ON \
       -DERF_ENABLE_FCOMPARE:BOOL=ON \
       -DERF_ENABLE_DOCUMENTATION:BOOL=OFF \

Build/cmake_with_radiation.sh

@@ -8,7 +8,6 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
       -DERF_DIM:STRING=3 \
       -DERF_ENABLE_MPI:BOOL=ON \
       -DERF_ENABLE_TESTS:BOOL=ON \
-      -DERF_ENABLE_EKAT:BOOL=ON \
       -DERF_ENABLE_RRTMGP:BOOL=ON \
       -DERF_ENABLE_NETCDF:BOOL=ON \
       -DERF_ENABLE_HDF5:BOOL=ON \

Build/cmake_with_radiation_cuda.sh

@@ -9,7 +9,6 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
       -DERF_ENABLE_MPI:BOOL=ON \
       -DERF_ENABLE_CUDA:BOOL=ON \
       -DERF_ENABLE_TESTS:BOOL=ON \
-      -DERF_ENABLE_EKAT:BOOL=ON \
       -DERF_ENABLE_RRTMGP:BOOL=ON \
       -DERF_ENABLE_NETCDF:BOOL=ON \
       -DERF_ENABLE_HDF5:BOOL=ON \

Build/cmake_with_shoc.sh

@@ -8,7 +8,6 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
       -DERF_DIM:STRING=3 \
       -DERF_ENABLE_MPI:BOOL=ON \
       -DERF_ENABLE_TESTS:BOOL=ON \
-      -DERF_ENABLE_EKAT:BOOL=ON \
       -DERF_ENABLE_SHOC:BOOL=ON \
       -DERF_ENABLE_FCOMPARE:BOOL=ON \
       -DERF_ENABLE_DOCUMENTATION:BOOL=OFF \

CMakeLists.txt

@@ -40,7 +40,6 @@ option(ERF_ENABLE_TESTS "Enable regression and unit tests" OFF)
 option(ERF_ENABLE_REGRESSION_TESTS_ONLY "Enable only regression tests" OFF)
 option(ERF_USE_INTERNAL_AMREX "Add AMReX as subproject" ON)
 option(ERF_ENABLE_NETCDF "Enable NetCDF IO" OFF)
-option(ERF_ENABLE_EKAT "Enable Ekat " OFF)
 option(ERF_ENABLE_HDF5 "Enable HDF5 IO" ${ERF_ENABLE_NETCDF})
 option(ERF_ENABLE_PARTICLES "Enable Lagrangian particles" OFF)
 option(ERF_ENABLE_FCOMPARE "Enable building fcompare when not testing" OFF)
@@ -155,8 +154,18 @@ endif()
 
 ########################## EKAT ##################################
 
+if(ERF_ENABLE_RRTMGP OR ERF_ENABLE_SHOC OR ERF_ENABLE_P3)
+  set(ERF_ENABLE_EKAT ON)
+else()
+  set(ERF_ENABLE_EKAT OFF)
+endif()
+
 if(ERF_ENABLE_EKAT)
 
+  if(NOT ERF_ENABLE_MPI)
+    message(FATAL_ERROR "CMake Error: MPI must be enabled if EKAT is enabled.")
+  endif()
+
   # NOTE: EKAT provides KOKKOS, so set relevant flags for KOKKOS
   if(ERF_ENABLE_CUDA)
     set(Kokkos_ENABLE_CUDA ON CACHE BOOL "kokkos enable cuda")
@@ -167,6 +176,7 @@ if(ERF_ENABLE_EKAT)
   if(ERF_ENABLE_HIP)
     set(Kokkos_ENABLE_HIP ON CACHE BOOL "kokkos enable hip")
     set(Kokkos_ENABLE_HIP_LAMBDA ON CACHE BOOL "kokkos enable hip lambda")
+    set(Kokkos_ENABLE_HIP_RELOCATABLE_DEVICE_CODE ON CACHE BOOL "kokkos enable hip RDC")
   endif()
 
   if(ERF_ENABLE_SYCL)