update kokkos min to 4.1

DavidJoy8 · Mar 25, 2024 · 3fe1766 · 3fe1766
1 parent 736ec45
commit 3fe1766
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -27,7 +27,7 @@ jobs:
         cxx: ['g++', 'clang++']
         backend: ['OPENMP', 'SERIAL']
         cmake_build_type: ['Debug', 'Release']
-        kokkos_ver: ['3.7.02']
+        kokkos_ver: ['4.1.00']
         bounds_check: ['OFF']
         arborx: ['OFF']
         heffte: ['OFF' ]
@@ -42,7 +42,7 @@ jobs:
             cxx: 'g++'
             backend: 'THREADS'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -52,7 +52,7 @@ jobs:
             cxx: 'icpx'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -61,7 +61,7 @@ jobs:
             cxx: 'icpx'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -70,7 +70,7 @@ jobs:
             cxx: 'icpx'
             backend: 'SERIAL'
             cmake_build_type: 'Release'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -79,7 +79,7 @@ jobs:
             cxx: 'icpx'
             backend: 'SERIAL'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -88,7 +88,7 @@ jobs:
             cxx: 'icpx'
             backend: 'SERIAL'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'MKL'
             hypre: 'OFF'
@@ -98,7 +98,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '4.0.00'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -109,7 +109,7 @@ jobs:
             cxx: 'clang++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '4.0.00'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -118,7 +118,7 @@ jobs:
             cxx: 'g++'
             cmake_build_type: 'Release'
             backend: 'OPENMP'
-            kokkos_ver: '4.0.00'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -127,7 +127,7 @@ jobs:
             cxx: 'clang++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '4.0.00'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -137,7 +137,7 @@ jobs:
             cxx: 'g++'
             cmake_build_type: 'Release'
             backend: 'OPENMP'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -146,7 +146,7 @@ jobs:
             cxx: 'clang++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -155,7 +155,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '4.0.00'
+            kokkos_ver: '4.1.00'
             arborx: 'ArborX'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -164,7 +164,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'ArborX'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -173,7 +173,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'FFTW'
             hypre: 'OFF'
@@ -182,7 +182,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Release'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -192,7 +192,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'HYPRE'
@@ -201,7 +201,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -211,7 +211,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'OFF'
             heffte: 'OFF'
             hypre: 'OFF'
@@ -221,7 +221,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'ArborX'
             heffte: 'FFTW'
             hypre: 'HYPRE'
@@ -234,7 +234,7 @@ jobs:
             cxx: 'g++'
             backend: 'OPENMP'
             cmake_build_type: 'Debug'
-            kokkos_ver: '3.7.02'
+            kokkos_ver: '4.1.00'
             arborx: 'ArborX'
             heffte: 'FFTW'
             hypre: 'HYPRE'
@@ -568,7 +568,7 @@ jobs:
       matrix:
         cxx: ['nvcc']
         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:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 # Dependencies
 #------------------------------------------------------------------------------#
 # find kokkos
-find_package(Kokkos 3.7 REQUIRED)
+find_package(Kokkos 4.1 REQUIRED)
 
 # set supported kokkos devices
 set(CABANA_SUPPORTED_DEVICES SERIAL THREADS OPENMP CUDA HIP SYCL OPENMPTARGET)

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -61,7 +61,7 @@ RUN OPENMPI_VERSION=4.0.2 && \
 ENV PATH=${OPENMPI_DIR}/bin:$PATH
 
 # Install Kokkos
-ARG KOKKOS_VERSION=3.7.02
+ARG KOKKOS_VERSION=4.1.00
 ENV KOKKOS_DIR=/opt/kokkos
 RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
     KOKKOS_ARCHIVE=kokkos-${KOKKOS_VERSION}.tar.gz && \

diff --git a/docker/Dockerfile.hipcc b/docker/Dockerfile.hipcc
@@ -71,7 +71,7 @@ RUN OPENMPI_VERSION=4.0.4 && \
 ENV PATH=${OPENMPI_DIR}/bin:$PATH
 
 # Install Kokkos
-ARG KOKKOS_VERSION=3.7.02
+ARG KOKKOS_VERSION=4.1.00
 ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_HIP=ON -DKokkos_ENABLE_LIBDL=OFF -DKokkos_ARCH_VEGA906=ON"
 ENV KOKKOS_DIR=/opt/kokkos
 RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \

diff --git a/docker/Dockerfile.sycl b/docker/Dockerfile.sycl
@@ -65,7 +65,7 @@ RUN wget https://cloud.cees.ornl.gov/download/oneapi-for-nvidia-gpus-${DPCPP_VER
     rm oneapi-for-nvidia-gpus-${DPCPP_VERSION}-linux.sh
 
 # Install Kokkos
-ARG KOKKOS_VERSION=3.7.02
+ARG KOKKOS_VERSION=4.1.00
 ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_FLAGS=-Wno-unknown-cuda-version -DKokkos_ENABLE_UNSUPPORTED_ARCHS=ON -DKokkos_ARCH_VOLTA70=ON -DCMAKE_CXX_STANDARD=17"
 ENV KOKKOS_DIR=/opt/kokkos
 RUN . /opt/intel/oneapi/setvars.sh --include-intel-llvm && \