mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
CI: updates kokkos version
This commit is contained in:
parent
5c3fa80afc
commit
11bf684f3c
@ -86,7 +86,7 @@
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1804_cuda_kokkos: &ubuntu1804_cuda_kokkos
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-20210819"
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-20210916"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
@ -96,7 +96,7 @@
|
||||
- .docker_image
|
||||
|
||||
.ubuntu2004_kokkos: &ubuntu2004_kokkos
|
||||
image: "kitware/vtkm:ci-ubuntu2004_kokkos-20201016"
|
||||
image: "kitware/vtkm:ci-ubuntu2004_kokkos-20210916"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
FROM nvidia/cuda:11.0-devel-ubuntu18.04
|
||||
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
|
||||
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@kitware.com>"
|
||||
|
||||
# Base dependencies for building VTK-m projects
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
@ -17,9 +17,9 @@ RUN git-lfs install
|
||||
|
||||
# kokkos backend requires cmake 3.18
|
||||
RUN mkdir /opt/cmake/ && \
|
||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.18.1/cmake-3.18.1-Linux-x86_64.sh > cmake-3.18.1-Linux-x86_64.sh && \
|
||||
sh cmake-3.18.1-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||
rm cmake-3.18.1-Linux-x86_64.sh && \
|
||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.sh > cmake-3.21.2-Linux-x86_64.sh && \
|
||||
sh cmake-3.21.2-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||
rm cmake-3.21.2-Linux-x86_64.sh && \
|
||||
ln -s /opt/cmake/bin/ctest /opt/cmake/bin/ctest-latest
|
||||
|
||||
ENV PATH "/opt/cmake/bin:${PATH}"
|
||||
@ -27,11 +27,11 @@ ENV PATH "/opt/cmake/bin:${PATH}"
|
||||
# Build and install Kokkos
|
||||
RUN mkdir -p /opt/kokkos/build && \
|
||||
cd /opt/kokkos/build && \
|
||||
curl -L https://github.com/kokkos/kokkos/archive/3.1.01.tar.gz > kokkos-3.1.01.tar.gz && \
|
||||
tar -xf kokkos-3.1.01.tar.gz && \
|
||||
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 && \
|
||||
mkdir bld && cd bld && \
|
||||
CXX=/opt/kokkos/build/kokkos-3.1.01/bin/nvcc_wrapper \
|
||||
cmake -B . -S ../kokkos-3.1.01 \
|
||||
CXX=/opt/kokkos/build/kokkos-3.4.01/bin/nvcc_wrapper \
|
||||
cmake -B . -S ../kokkos-3.4.01 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/opt/kokkos \
|
||||
-DCMAKE_CXX_FLAGS=-fPIC \
|
||||
|
@ -23,9 +23,9 @@ RUN git-lfs install
|
||||
# Provide CMake 3.17 so we can re-run tests easily
|
||||
# This will be used when we run just the tests
|
||||
RUN mkdir /opt/cmake/ && \
|
||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
|
||||
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||
rm cmake-3.17.3-Linux-x86_64.sh && \
|
||||
curl -L https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.sh > cmake-3.21.2-Linux-x86_64.sh && \
|
||||
sh cmake-3.21.2-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
|
||||
rm cmake-3.21.2-Linux-x86_64.sh && \
|
||||
ln -s /opt/cmake/bin/ctest /opt/cmake/bin/ctest-latest
|
||||
|
||||
ENV PATH "${PATH}:/opt/cmake/bin"
|
||||
@ -33,9 +33,9 @@ ENV PATH "${PATH}:/opt/cmake/bin"
|
||||
# Build and install Kokkos
|
||||
RUN mkdir -p /opt/kokkos/build && \
|
||||
cd /opt/kokkos/build && \
|
||||
curl -L https://github.com/kokkos/kokkos/archive/3.1.01.tar.gz > kokkos-3.1.01.tar.gz && \
|
||||
tar -xf kokkos-3.1.01.tar.gz && \
|
||||
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 && \
|
||||
mkdir bld && cd bld && \
|
||||
cmake -GNinja -DCMAKE_INSTALL_PREFIX=/opt/kokkos -DCMAKE_CXX_FLAGS=-fPIC -DKokkos_ENABLE_SERIAL=ON ../kokkos-3.1.01 &&\
|
||||
cmake -GNinja -DCMAKE_INSTALL_PREFIX=/opt/kokkos -DCMAKE_CXX_FLAGS=-fPIC -DKokkos_ENABLE_SERIAL=ON ../kokkos-3.4.01 &&\
|
||||
ninja all && \
|
||||
ninja install
|
||||
|
@ -284,6 +284,11 @@ VTKM_THIRDPARTY_PRE_INCLUDE
|
||||
|
||||
#if defined(KOKKOS_ENABLE_CUDA) && !defined(VTKM_CUDA)
|
||||
#undef KOKKOS_ENABLE_CUDA
|
||||
|
||||
// In later versions we need to directly deactivate Kokkos_Setup_Cuda.hpp
|
||||
#if KOKKOS_VERSION >= 30401
|
||||
#define KOKKOS_CUDA_SETUP_HPP_
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(KOKKOS_ENABLE_HIP) && !defined(VTKM_HIP)
|
||||
|
Loading…
Reference in New Issue
Block a user