mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
CI: add clang+cuda and correct missing cuda packages on centos
This commit is contained in:
parent
074c8b1100
commit
c73bc0a93f
@ -49,52 +49,52 @@
|
||||
GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
|
||||
|
||||
.centos7: ¢os7
|
||||
image: "kitware/vtkm:ci-centos7_cuda10.2-20200729"
|
||||
image: "kitware/vtkm:ci-centos7_cuda10.2-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.centos8: ¢os8
|
||||
image: "kitware/vtkm:ci-centos8-20200729"
|
||||
image: "kitware/vtkm:ci-centos8-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.rhel8: &rhel8
|
||||
image: "kitware/vtkm:ci-rhel8_cuda10.2-20200729"
|
||||
image: "kitware/vtkm:ci-rhel8_cuda10.2-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1604: &ubuntu1604
|
||||
image: "kitware/vtkm:ci-ubuntu1604-20200729"
|
||||
image: "kitware/vtkm:ci-ubuntu1604-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1604_cuda: &ubuntu1604_cuda
|
||||
image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200729"
|
||||
image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1804: &ubuntu1804
|
||||
image: "kitware/vtkm:ci-ubuntu1804-20200729"
|
||||
image: "kitware/vtkm:ci-ubuntu1804-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1804_cuda: &ubuntu1804_cuda
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200729"
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu1804_cuda_kokkos: &ubuntu1804_cuda_kokkos
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-20200729"
|
||||
image: "kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu2004_doxygen: &ubuntu2004_doxygen
|
||||
image: "kitware/vtkm:ci-doxygen-20200729"
|
||||
image: "kitware/vtkm:ci-doxygen-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
.ubuntu2004_kokkos: &ubuntu2004_kokkos
|
||||
image: "kitware/vtkm:ci-ubuntu2004_kokkos-20200729"
|
||||
image: "kitware/vtkm:ci-ubuntu2004_kokkos-20200820"
|
||||
extends:
|
||||
- .docker_image
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
FROM nvidia/cuda:10.2-devel-centos7
|
||||
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
|
||||
|
||||
RUN yum install cmake make gcc gcc-c++ -y
|
||||
RUN yum install make gcc gcc-c++ curl cuda-compat-10-2 -y
|
||||
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash
|
||||
RUN yum install git git-lfs -y
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
FROM nvidia/cuda:10.2-devel-ubi8
|
||||
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
|
||||
|
||||
RUN yum install make gcc gcc-c++ curl -y
|
||||
RUN yum install make gcc gcc-c++ curl cuda-compat-10-2 -y
|
||||
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash
|
||||
RUN yum install git git-lfs -y
|
||||
|
||||
|
@ -5,6 +5,7 @@ LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
curl \
|
||||
g++ \
|
||||
clang-8 \
|
||||
git \
|
||||
git-lfs \
|
||||
libmpich-dev \
|
||||
|
@ -75,42 +75,45 @@ test:ubuntu1804_gcc7:
|
||||
- build:ubuntu1804_gcc7
|
||||
|
||||
|
||||
# Build on ubuntu1804 with OpenMP and test on ubuntu1804
|
||||
# Uses gcc 7.4
|
||||
# Build on ubuntu1804 with CUDA+TBB and test on ubuntu1804
|
||||
# Uses clang as CUDA host compiler
|
||||
# Runs only on nightlies
|
||||
build:ubuntu1804_gcc7_2:
|
||||
build:ubuntu1804_clang_cuda:
|
||||
tags:
|
||||
- build
|
||||
- vtkm
|
||||
- docker
|
||||
- linux
|
||||
- cuda-rt
|
||||
- large-memory
|
||||
extends:
|
||||
- .ubuntu1804
|
||||
- .ubuntu1804_cuda
|
||||
- .cmake_build_linux
|
||||
- .only-master
|
||||
- .only-default
|
||||
# - .only-master
|
||||
variables:
|
||||
CC: "gcc-7"
|
||||
CXX: "g++-7"
|
||||
VTKM_SETTINGS: "openmp+shared+examples"
|
||||
CC: "clang-8"
|
||||
CXX: "clang++-8"
|
||||
CUDAHOSTCXX: "clang++-8"
|
||||
VTKM_SETTINGS: "cuda+pascal+tbb+static+examples"
|
||||
|
||||
test:ubuntu1804_gcc7_2:
|
||||
test:ubuntu1804_clang_cuda:
|
||||
tags:
|
||||
- test
|
||||
- vtkm
|
||||
- docker
|
||||
- linux
|
||||
- cuda-rt
|
||||
- pascal
|
||||
extends:
|
||||
- .ubuntu1804
|
||||
- .ubuntu1804_cuda
|
||||
- .cmake_test_linux
|
||||
- .only-master
|
||||
variables:
|
||||
#Restrict OpenMP number of threads since multiple test stages
|
||||
#execute on the same hardware concurrently
|
||||
OMP_NUM_THREADS: 4
|
||||
- .only-default
|
||||
# - .only-master
|
||||
dependencies:
|
||||
- build:ubuntu1804_gcc7_2
|
||||
- build:ubuntu1804_clang_cuda
|
||||
needs:
|
||||
- build:ubuntu1804_gcc7_2
|
||||
- build:ubuntu1804_clang_cuda
|
||||
|
||||
# Build on ubuntu1804 with OpenMP and test on ubuntu1804
|
||||
# Uses gcc 6.5
|
||||
|
Loading…
Reference in New Issue
Block a user