diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e34c31d0f0f27c25ca0a0cb29fdcb9d57b92e3c4..e74906bc888b474c609729e7479333095b61d58d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ - .docker_image .ubuntu1604_cuda: &ubuntu1604_cuda - image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20201016" + image: "kitware/vtkm:ci-ubuntu1604_cuda11.3-20220113" extends: - .docker_image diff --git a/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile b/.gitlab/ci/docker/ubuntu1604/cuda11.3/Dockerfile similarity index 97% rename from .gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile rename to .gitlab/ci/docker/ubuntu1604/cuda11.3/Dockerfile index f403ae016c01578ace047a239210c116226903ba..81781e63747432a8fe2c9942e4cda47d3ffc8d38 100644 --- a/.gitlab/ci/docker/ubuntu1604/cuda9.2/Dockerfile +++ b/.gitlab/ci/docker/ubuntu1604/cuda11.3/Dockerfile @@ -1,4 +1,4 @@ -FROM nvidia/cuda:9.2-devel-ubuntu16.04 +FROM nvidia/cuda:11.3.1-devel-ubuntu16.04 LABEL maintainer "Robert Maynard" # Base dependencies for building VTK-m projects diff --git a/.gitlab/ci/ubuntu1604.yml b/.gitlab/ci/ubuntu1604.yml index ded8bfe9fa57ee3314b879070394e337da87e9e6..4f2c96f14fa928479b82d4e7227e214fc2dc4ff0 100644 --- a/.gitlab/ci/ubuntu1604.yml +++ b/.gitlab/ci/ubuntu1604.yml @@ -1,6 +1,5 @@ -# Build on ubuntu1604 with CUDA 9.2 and test on ubuntu1604 and ubuntu1804 -# Uses gcc 5, and build for pascal as CUDA 9.2 doesn't support turing +# Build on ubuntu1604 with CUDA 11.3 and test on ubuntu1604 and ubuntu1804 build:ubuntu1604_gcc5: tags: - build @@ -23,7 +22,6 @@ build:ubuntu1604_gcc5: test:ubuntu1604_gcc5: tags: - test - - vtkm - docker - linux - cuda-rt @@ -56,7 +54,7 @@ build:ubuntu1604_gcc5_2: CC: "gcc-5" CXX: "g++-5" CMAKE_BUILD_TYPE: Release - VTKM_SETTINGS: "openmp+cuda+pascal+examples+static" + VTKM_SETTINGS: "openmp+cuda+turing+examples+static" test:ubuntu1804_test_ubuntu1604_gcc5_2: tags: @@ -65,7 +63,7 @@ test:ubuntu1804_test_ubuntu1604_gcc5_2: - docker - linux - cuda-rt - - pascal + - turing extends: - .ubuntu1804_cuda - .cmake_test_linux diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml index 486932d9dcc7ddb79f81afb8018da7336b2f6f2e..03995c040b9b11e5d716cbc365099490fd6b5202 100644 --- a/.gitlab/ci/ubuntu1804.yml +++ b/.gitlab/ci/ubuntu1804.yml @@ -96,7 +96,7 @@ build:ubuntu1804_clang_cuda: CC: "clang-8" CXX: "clang++-8" CUDAHOSTCXX: "clang++-8" - VTKM_SETTINGS: "cuda+pascal+tbb+examples+shared" + VTKM_SETTINGS: "cuda+turing+tbb+examples+shared" test:ubuntu1804_clang_cuda: tags: @@ -105,7 +105,7 @@ test:ubuntu1804_clang_cuda: - docker - linux - cuda-rt - - pascal + - turing extends: - .ubuntu1804_cuda - .cmake_test_linux