update CI for no_virtual
This commit is contained in:
parent
4817ffbc91
commit
534fccdbaa
@ -17,7 +17,7 @@ build:centos7_gcc73:
|
||||
variables:
|
||||
CMAKE_BUILD_TYPE: RelWithDebInfo
|
||||
CMAKE_GENERATOR: "Unix Makefiles"
|
||||
VTKM_SETTINGS: "cuda+turing+32bit_ids+no_rendering+no_virtual+shared"
|
||||
VTKM_SETTINGS: "cuda+turing+32bit_ids+no_rendering+shared"
|
||||
|
||||
test:centos7_gcc73:
|
||||
tags:
|
||||
|
@ -53,8 +53,8 @@ foreach(option IN LISTS options)
|
||||
elseif(no_rendering STREQUAL option)
|
||||
set(VTKm_ENABLE_RENDERING "OFF" CACHE STRING "")
|
||||
|
||||
elseif(no_virtual STREQUAL option)
|
||||
set(VTKm_NO_DEPRECATED_VIRTUAL "ON" CACHE STRING "")
|
||||
elseif(use_virtuals STREQUAL option)
|
||||
set(VTKm_NO_DEPRECATED_VIRTUAL "OFF" CACHE STRING "")
|
||||
|
||||
elseif(examples STREQUAL option)
|
||||
set(VTKm_ENABLE_EXAMPLES "ON" CACHE STRING "")
|
||||
|
@ -13,7 +13,7 @@ build:rhel8:
|
||||
- .only-default
|
||||
variables:
|
||||
CMAKE_GENERATOR: "Unix Makefiles"
|
||||
VTKM_SETTINGS: "serial+shared+64bit_floats+32bit_ids"
|
||||
VTKM_SETTINGS: "serial+shared+64bit_floats+32bit_ids+use_virtuals"
|
||||
|
||||
test:rhel8:
|
||||
tags:
|
||||
|
@ -18,7 +18,7 @@ build:ubuntu1604_gcc5:
|
||||
CC: "gcc-5"
|
||||
CXX: "g++-5"
|
||||
CMAKE_BUILD_TYPE: RelWithDebInfo
|
||||
VTKM_SETTINGS: "cuda+pascal+no_virtual+shared+ascent_types+32bit_ids+64bit_floats"
|
||||
VTKM_SETTINGS: "cuda+pascal+shared+ascent_types+32bit_ids+64bit_floats"
|
||||
|
||||
test:ubuntu1604_gcc5:
|
||||
tags:
|
||||
@ -56,7 +56,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+pascal+examples+static+use_virtuals"
|
||||
|
||||
test:ubuntu1804_test_ubuntu1604_gcc5_2:
|
||||
tags:
|
||||
|
@ -56,7 +56,7 @@ build:ubuntu1804_gcc7:
|
||||
CC: "gcc-7"
|
||||
CXX: "g++-7"
|
||||
CUDAHOSTCXX: "g++-7"
|
||||
VTKM_SETTINGS: "benchmarks+cuda+turing+mpi+64bit_floats+no_virtual+shared"
|
||||
VTKM_SETTINGS: "benchmarks+cuda+turing+mpi+64bit_floats+shared"
|
||||
|
||||
test:ubuntu1804_gcc7:
|
||||
tags:
|
||||
@ -96,7 +96,7 @@ build:ubuntu1804_clang_cuda:
|
||||
CC: "clang-8"
|
||||
CXX: "clang++-8"
|
||||
CUDAHOSTCXX: "clang++-8"
|
||||
VTKM_SETTINGS: "cuda+pascal+tbb+examples+no_virtual+shared"
|
||||
VTKM_SETTINGS: "cuda+pascal+tbb+examples+shared"
|
||||
|
||||
test:ubuntu1804_clang_cuda:
|
||||
tags:
|
||||
@ -202,7 +202,7 @@ build:ubuntu1804_kokkos:
|
||||
variables:
|
||||
CMAKE_GENERATOR: "Ninja"
|
||||
CMAKE_BUILD_TYPE: Release
|
||||
VTKM_SETTINGS: "benchmarks+kokkos+turing+64bit_floats+no_virtual+shared"
|
||||
VTKM_SETTINGS: "benchmarks+kokkos+turing+64bit_floats+shared"
|
||||
|
||||
test:ubuntu1804_kokkos:
|
||||
tags:
|
||||
|
Loading…
Reference in New Issue
Block a user