diff --git a/.gitlab/ci/centos7.yml b/.gitlab/ci/centos7.yml index 52dffe109..cc17b4b9f 100644 --- a/.gitlab/ci/centos7.yml +++ b/.gitlab/ci/centos7.yml @@ -7,6 +7,7 @@ build:centos7_gcc48: - vtkm - docker - linux + - cuda-rt - large-memory extends: - .centos7 @@ -20,11 +21,11 @@ build:centos7_gcc48: test:centos7_gcc48: tags: - test - - cuda-rt - - turing - vtkm - docker - linux + - cuda-rt + - turing extends: - .centos7 - .cmake_test_linux @@ -37,11 +38,11 @@ test:centos7_gcc48: test:rhel8_test_centos7: tags: - test - - cuda-rt - - turing - vtkm - docker - linux + - cuda-rt + - turing extends: - .rhel8 - .cmake_test_linux diff --git a/.gitlab/ci/ubuntu1604.yml b/.gitlab/ci/ubuntu1604.yml index e0d6c14ba..e57325d4e 100644 --- a/.gitlab/ci/ubuntu1604.yml +++ b/.gitlab/ci/ubuntu1604.yml @@ -7,6 +7,7 @@ build:ubuntu1604_gcc5: - vtkm - docker - linux + - cuda-rt - large-memory extends: - .ubuntu1604_cuda @@ -18,39 +19,22 @@ build:ubuntu1604_gcc5: CMAKE_BUILD_TYPE: RelWithDebInfo VTKM_SETTINGS: "cuda+pascal" -# Temporarily disabled as we don't have a pascal hw gitlab-runner -# test:ubuntu1604_gcc5: -# tags: -# - test -# - cuda-rt -# - pascal -# - vtkm -# - docker -# - linux -# extends: -# - .ubuntu1604_cuda -# - .cmake_test_linux -# - .only-default -# dependencies: -# - build:ubuntu1604_gcc5 -# needs: -# - build:ubuntu1604_gcc5 -# test:ubuntu1804_test_ubuntu1604_gcc5: -# tags: -# - test -# - cuda-rt -# - pascal -# - vtkm -# - docker -# - linux -# extends: -# - .ubuntu1804_cuda -# - .cmake_test_linux -# - .only-default -# dependencies: -# - build:ubuntu1604_gcc5 -# needs: -# - build:ubuntu1604_gcc5 +test:ubuntu1604_gcc5: + tags: + - test + - vtkm + - docker + - linux + - cuda-rt + - pascal + extends: + - .ubuntu1604_cuda + - .cmake_test_linux + - .only-default + dependencies: + - build:ubuntu1604_gcc5 + needs: + - build:ubuntu1604_gcc5 # Build on ubuntu1704 with OpenMP + CUDA # Runs only on nightlies @@ -60,6 +44,7 @@ build:ubuntu1604_gcc5_2: - vtkm - docker - linux + - cuda-rt - large-memory extends: - .ubuntu1604_cuda @@ -71,6 +56,23 @@ build:ubuntu1604_gcc5_2: CMAKE_BUILD_TYPE: Release VTKM_SETTINGS: "openmp+cuda+pascal+examples" +test:ubuntu1804_test_ubuntu1604_gcc5_2: + tags: + - test + - vtkm + - docker + - linux + - cuda-rt + - pascal + extends: + - .ubuntu1804_cuda + - .cmake_test_linux + - .only-master + dependencies: + - build:ubuntu1604_gcc5_2 + needs: + - build:ubuntu1604_gcc5_2 + # Build on ubuntu1604 with mpi + tbb and test on ubuntu1604 # Uses gcc 4.8 # Uses OpenMPI diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml index d5ac170af..9cdccb12e 100644 --- a/.gitlab/ci/ubuntu1804.yml +++ b/.gitlab/ci/ubuntu1804.yml @@ -46,6 +46,7 @@ build:ubuntu1804_gcc7: - vtkm - docker - linux + - cuda-rt - large-memory extends: - .ubuntu1804_cuda @@ -59,11 +60,11 @@ build:ubuntu1804_gcc7: test:ubuntu1804_gcc7: tags: - test - - cuda-rt - - turing - vtkm - docker - linux + - cuda-rt + - turing extends: - .ubuntu1804_cuda - .cmake_test_linux diff --git a/docs/CI-README.md b/docs/CI-README.md index 7ffceeac2..36255029f 100644 --- a/docs/CI-README.md +++ b/docs/CI-README.md @@ -60,14 +60,14 @@ Current gitlab runner tags for VTK-m are: Used to state that we require a linux based gitlab-runner - large-memory Used to state that this step will require a machine that has lots of memory. - This is currently used for cuda `build` requests + This is currently used for CUDA `build` requests - cuda-rt - Used to state that the runner is required to have the cuda runtime enviornment. - This isn't required to `build` VTK-m, only `test` + Used to state that the runner is required to have the CUDA runtime environment. + This is required to `build` and `test` VTK-m when using CUDA - maxwell - pascal - turing - Only used on a `test` stage to signifiy which GPU hardware is required to + Only used on a `test` stage to signify which GPU hardware is required to run the VTK-m tests # How to use docker builders locally