diff --git a/.gitlab/ci/ubuntu1604.yml b/.gitlab/ci/ubuntu1604.yml index c28413672..4b1167471 100644 --- a/.gitlab/ci/ubuntu1604.yml +++ b/.gitlab/ci/ubuntu1604.yml @@ -52,6 +52,25 @@ build:ubuntu1604_gcc5: # needs: # - build:ubuntu1604_gcc5 +# Build on ubuntu1704 with OpenMP + CUDA +# Runs only on nightlies +build:ubuntu1604_gcc5_2: + tags: + - build + - vtkm + - docker + - linux + - large-memory + extends: + - .ubuntu1604_cuda + - .cmake_build_linux + - .only-master + variables: + CC: "gcc-5" + CXX: "g++-5" + CMAKE_BUILD_TYPE: Release + VTKM_SETTINGS: "openmp+cuda+pascal+examples" + # Build on ubuntu1604 with mpi + tbb and test on ubuntu1604 # Uses gcc 4.8 # Uses OpenMPI @@ -105,8 +124,6 @@ build:ubuntu1604_clang5: - docker - linux extends: - #Requires the cuda docker image as it uses a sufficiently new - #enough CMake version that supports mpi - .ubuntu1604 - .cmake_build_linux - .only-default diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml index eea36ba8c..d5ac170af 100644 --- a/.gitlab/ci/ubuntu1804.yml +++ b/.gitlab/ci/ubuntu1804.yml @@ -126,7 +126,7 @@ build:ubuntu1804_gcc6: variables: CC: "gcc-6" CXX: "g++-6" - VTKM_SETTINGS: "openmp+shared" + VTKM_SETTINGS: "openmp+shared+examples" test:ubuntu1804_gcc6: tags: @@ -163,7 +163,7 @@ build:ubuntu1804_clang8: CC: "clang-8" CXX: "clang++-8" CMAKE_BUILD_TYPE: Debug - VTKM_SETTINGS: "tbb+shared" + VTKM_SETTINGS: "tbb+shared+examples" test:ubuntu1804_clang8: tags: