Bump min Kokkos to 4.1 for math functions;

bump min Cabana to 0.7 for simplicity
ORNL · Dec 20, 2024 · 35c1d12 · 35c1d12
1 parent 5bf4651
commit 35c1d12
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -20,26 +20,26 @@ jobs:
         cxx: ['g++', 'clang++']
         backend: ['SERIAL', 'OPENMP']
         cmake_build_type: ['Debug', 'Release']
-        kokkos_ver: ['3.7.02']
+        kokkos_ver: ['4.1.00']
         output: ['HDF5']
         include:
           - distro: 'ubuntu:latest'
             cxx: 'g++'
             backend: 'SERIAL'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             output: 'SILO'
           - distro: 'ubuntu:latest'
             cxx: 'g++'
             backend: 'SERIAL'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             output: 'NONE'
           - distro: 'ubuntu:latest'
             cxx: 'g++'
             backend: 'SERIAL'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             output: 'BOTH'
     runs-on: ubuntu-20.04
     container: ghcr.io/ecp-copa/ci-containers/${{ matrix.distro }}
@@ -65,8 +65,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: ECP-CoPA/Cabana
-          # This version is post-release 0.6
-          ref: f99c7db9d54c57373ada6b16132c20d89d1ebb8e
+          ref: 0.7.0
           path: cabana
       - name: Build Cabana
         working-directory: cabana
@@ -118,7 +117,8 @@ jobs:
       matrix:
         cxx: ['hipcc']
         cmake_build_type: ['Release']
-        kokkos_ver: ['3.7.02']
+        # Using >4.1 because of kokkos build error without available device
+        kokkos_ver: ['4.2.01']
     runs-on: ubuntu-20.04
     container: ghcr.io/ecp-copa/ci-containers/rocm:latest
     steps:
@@ -158,8 +158,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: ECP-CoPA/Cabana
-          # This version is post-release 0.6
-          ref: f99c7db9d54c57373ada6b16132c20d89d1ebb8e
+          ref: 0.7.0
           path: cabana
       - name: Build Cabana
         working-directory: cabana
@@ -200,7 +199,7 @@ jobs:
     strategy:
       matrix:
         cmake_build_type: ['Release']
-        kokkos_ver: ['3.7.02']
+        kokkos_ver: ['4.1.00']
     runs-on: ubuntu-20.04
     container: ghcr.io/ecp-copa/ci-containers/cuda:12.2.0
     steps:
@@ -240,8 +239,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: ECP-CoPA/Cabana
-          # This version is post-release 0.6
-          ref: f99c7db9d54c57373ada6b16132c20d89d1ebb8e
+          ref: 0.7.0
           path: cabana
       - name: Build Cabana
         working-directory: cabana

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 ##---------------------------------------------------------------------------##
 # Set up main options (inherit from Kokkos and Cabana CMake)
 ##---------------------------------------------------------------------------##
-find_package(Cabana REQUIRED)
+find_package(Cabana REQUIRED 0.7.0)
 
 macro(CabanaPD_check_optional)
   cmake_parse_arguments(CABANA "" "OPTION" "" ${ARGN})