mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
Update ubuntu1804+cuda from 10.1 to 11.1
The image was previously using 10.1 which has issues generating ptx for numerous filters. Moving to a newer CUDA version corrects these issues
This commit is contained in:
parent
a671ab6695
commit
d5d91c61d3
@ -32,9 +32,10 @@
|
||||
# - tbb
|
||||
# - openmp
|
||||
# - mpich2
|
||||
# * .gitlab/ci/docker/ubuntu1804/cuda10.1/
|
||||
# * .gitlab/ci/docker/ubuntu1804/cuda11.1/
|
||||
# - cuda
|
||||
# - gcc 7.4
|
||||
# - gcc 7
|
||||
# - gcc 8
|
||||
# - tbb
|
||||
# - openmp
|
||||
# - mpich2
|
||||
@ -49,52 +50,52 @@
|
||||
GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
|
||||
|
||||
.centos7: ¢os7
|
||||
image: "kitware/vtkm:ci-centos7_cuda10.2-20200820"
|
||||
image: "kitware/vtkm:ci-centos7_cuda10.2-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.centos8: ¢os8
|
||||
image: "kitware/vtkm:ci-centos8-20200820"
|
||||
image: "kitware/vtkm:ci-centos8-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.rhel8: &rhel8
|
||||
image: "kitware/vtkm:ci-rhel8_cuda10.2-20200820"
|
||||
image: "kitware/vtkm:ci-rhel8_cuda10.2-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1604: &ubuntu1604
|
||||
image: "kitware/vtkm:ci-ubuntu1604-20200820"
|
||||
image: "kitware/vtkm:ci-ubuntu1604-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1604_cuda: &ubuntu1604_cuda
|
||||
image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200820"
|
||||
image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1804: &ubuntu1804
|
||||
image: "kitware/vtkm:ci-ubuntu1804-20200820"
|
||||
image: "kitware/vtkm:ci-ubuntu1804-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1804_cuda: &ubuntu1804_cuda
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200820"
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda11.1-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1804_cuda_kokkos: &ubuntu1804_cuda_kokkos
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-20200820"
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu2004_doxygen: &ubuntu2004_doxygen
|
||||
image: "kitware/vtkm:ci-doxygen-20200820"
|
||||
image: "kitware/vtkm:ci-doxygen-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu2004_kokkos: &ubuntu2004_kokkos
|
||||
image: "kitware/vtkm:ci-ubuntu2004_kokkos-20200820"
|
||||
image: "kitware/vtkm:ci-ubuntu2004_kokkos-20201016"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
|
4
.gitlab/ci/docker/ubuntu1804/cuda10.1/Dockerfile → .gitlab/ci/docker/ubuntu1804/cuda11.1/Dockerfile
4
.gitlab/ci/docker/ubuntu1804/cuda10.1/Dockerfile → .gitlab/ci/docker/ubuntu1804/cuda11.1/Dockerfile
@ -1,10 +1,10 @@
|
||||
FROM nvidia/cuda:10.1-devel-ubuntu18.04
|
||||
FROM nvidia/cuda:11.1-devel-ubuntu18.04
|
||||
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
|
||||
|
||||
# Base dependencies for building VTK-m projects
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
curl \
|
||||
g++ \
|
||||
g++-8 \
|
||||
clang-8 \
|
||||
git \
|
||||
git-lfs \
|
@ -30,8 +30,8 @@ cd ubuntu1804/base
|
||||
sudo docker build -t kitware/vtkm:ci-ubuntu1804-$date .
|
||||
cd ../..
|
||||
|
||||
cd ubuntu1804/cuda10.1
|
||||
sudo docker build -t kitware/vtkm:ci-ubuntu1804_cuda10.1-$date .
|
||||
cd ubuntu1804/cuda11.1
|
||||
sudo docker build -t kitware/vtkm:ci-ubuntu1804_cuda11.1-$date .
|
||||
cd ../..
|
||||
|
||||
cd ubuntu1804/kokkos-cuda
|
||||
|
@ -38,7 +38,7 @@ test:ubuntu1804_gcc9:
|
||||
- build:ubuntu1804_gcc9
|
||||
|
||||
# Build on ubuntu1804 with CUDA + MPI and test on ubuntu1804
|
||||
# Uses gcc 7.4
|
||||
# Uses gcc 7
|
||||
# Uses MPICH2
|
||||
build:ubuntu1804_gcc7:
|
||||
tags:
|
||||
@ -55,6 +55,7 @@ build:ubuntu1804_gcc7:
|
||||
variables:
|
||||
CC: "gcc-7"
|
||||
CXX: "g++-7"
|
||||
CUDAHOSTCXX: "g++-7"
|
||||
VTKM_SETTINGS: "cuda+turing+mpi+64bit_floats+no_virtual"
|
||||
|
||||
test:ubuntu1804_gcc7:
|
||||
|
@ -76,8 +76,8 @@ VTK-m Requires:
|
||||
Optional dependencies are:
|
||||
|
||||
+ CUDA Device Adapter
|
||||
+ [Cuda Toolkit 9.2+](https://developer.nvidia.com/cuda-toolkit)
|
||||
+ Note CUDA >= 10.1 is required on Windows
|
||||
+ [Cuda Toolkit 9.2, >= 10.2](https://developer.nvidia.com/cuda-toolkit)
|
||||
+ Note CUDA >= 10.2 is required on Windows
|
||||
+ TBB Device Adapter
|
||||
+ [TBB](https://www.threadingbuildingblocks.org/)
|
||||
+ OpenMP Device Adapter
|
||||
@ -105,12 +105,12 @@ VTK-m has been tested on the following configurations:c
|
||||
+ On Linux
|
||||
+ GCC 4.8.5, 5.4, 6.5, 7.4, 8.2, 9.2; Clang 5, 8; Intel 17.0.4; 19.0.0
|
||||
+ CMake 3.12, 3.13, 3.16, 3.17
|
||||
+ CUDA 9.2.148, 10.0.130, 10.1.105, 10.2.89
|
||||
+ CUDA 9.2, 10.2, 11.0, 11.1
|
||||
+ TBB 4.4 U2, 2017 U7
|
||||
+ On Windows
|
||||
+ Visual Studio 2015, 2017
|
||||
+ CMake 3.12, 3.17
|
||||
+ CUDA 10.1
|
||||
+ CUDA 10.2
|
||||
+ TBB 2017 U3, 2018 U2
|
||||
+ On MacOS
|
||||
+ AppleClang 9.1
|
||||
|
Loading…
Reference in New Issue
Block a user