diff --git a/.gitlab/ci/docker/ubuntu1804/kokkos-cuda/Dockerfile b/.gitlab/ci/docker/ubuntu1804/kokkos-cuda/Dockerfile index 463393d47..1383dc4ff 100644 --- a/.gitlab/ci/docker/ubuntu1804/kokkos-cuda/Dockerfile +++ b/.gitlab/ci/docker/ubuntu1804/kokkos-cuda/Dockerfile @@ -25,13 +25,14 @@ RUN mkdir /opt/cmake/ && \ ENV PATH "/opt/cmake/bin:${PATH}" # Build and install Kokkos +ARG KOKKOS_VERSION=3.7.01 RUN mkdir -p /opt/kokkos/build && \ cd /opt/kokkos/build && \ - curl -L https://github.com/kokkos/kokkos/archive/refs/tags/3.4.01.tar.gz > kokkos-3.4.01.tar.gz && \ - tar -xf kokkos-3.4.01.tar.gz && \ + curl -L https://github.com/kokkos/kokkos/archive/refs/tags/$KOKKOS_VERSION.tar.gz > kokkos-$KOKKOS_VERSION.tar.gz && \ + tar -xf kokkos-$KOKKOS_VERSION.tar.gz && \ mkdir bld && cd bld && \ - CXX=/opt/kokkos/build/kokkos-3.4.01/bin/nvcc_wrapper \ - cmake -B . -S ../kokkos-3.4.01 \ + CXX=/opt/kokkos/build/kokkos-$KOKKOS_VERSION/bin/nvcc_wrapper \ + cmake -B . -S ../kokkos-$KOKKOS_VERSION \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/opt/kokkos \ -DCMAKE_CXX_FLAGS=-fPIC \ diff --git a/.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile b/.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile index c6dfc5cc3..ebb8501e6 100644 --- a/.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile +++ b/.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile @@ -44,7 +44,7 @@ ENV CMAKE_PREFIX_PATH "/opt/rocm/lib/cmake:/opt/rocm/lib:${CMAKE_PREFIX_PATH}" ENV CMAKE_GENERATOR "Ninja" # Build and install Kokkos -ARG KOKKOS_VERSION=3.6.00 +ARG KOKKOS_VERSION=3.7.01 COPY kokkos_cmake_config.cmake kokkos_cmake_config.cmake RUN curl -L https://github.com/kokkos/kokkos/archive/refs/tags/$KOKKOS_VERSION.tar.gz | tar -xzf - && \ cmake -S kokkos-$KOKKOS_VERSION -B build -C kokkos_cmake_config.cmake && \ diff --git a/.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile b/.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile index e172b98c8..90e33d573 100644 --- a/.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile +++ b/.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile @@ -31,11 +31,12 @@ RUN mkdir /opt/cmake/ && \ ENV PATH "${PATH}:/opt/cmake/bin" # Build and install Kokkos +ARG KOKKOS_VERSION=3.7.01 RUN mkdir -p /opt/kokkos/build && \ cd /opt/kokkos/build && \ - curl -L https://github.com/kokkos/kokkos/archive/refs/tags/3.4.01.tar.gz > kokkos-3.4.01.tar.gz && \ - tar -xf kokkos-3.4.01.tar.gz && \ + curl -L https://github.com/kokkos/kokkos/archive/refs/tags/$KOKKOS_VERSION.tar.gz > kokkos-$KOKKOS_VERSION.tar.gz && \ + tar -xf kokkos-$KOKKOS_VERSION.tar.gz && \ mkdir bld && cd bld && \ - cmake -GNinja -DCMAKE_INSTALL_PREFIX=/opt/kokkos -DCMAKE_CXX_FLAGS=-fPIC -DKokkos_ENABLE_SERIAL=ON ../kokkos-3.4.01 &&\ + cmake -GNinja -DCMAKE_INSTALL_PREFIX=/opt/kokkos -DCMAKE_CXX_FLAGS=-fPIC -DKokkos_ENABLE_SERIAL=ON ../kokkos-$KOKKOS_VERSION &&\ ninja all && \ ninja install