This repository was archived by the owner on Jul 14, 2022. It is now read-only.
File tree 3 files changed +11
-6
lines changed
3 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -229,9 +229,14 @@ stages:
229
229
timeoutInMinutes : 0
230
230
strategy :
231
231
matrix :
232
+ shared_vtkh :
233
+ BUILD_SHARED_LIBS : ON
234
+ CMAKE_BUILD_TYPE : Release
235
+ SPACK_SHARED_VARIANT : +shared
232
236
static_vtkh :
233
237
BUILD_SHARED_LIBS : OFF
234
238
CMAKE_BUILD_TYPE : Release
239
+ SPACK_SHARED_VARIANT : ~shared
235
240
steps :
236
241
- checkout : self
237
242
clean : boolean
@@ -266,7 +271,7 @@ stages:
266
271
which python
267
272
python --version
268
273
# setup spack spec (must be static)
269
- export SPACK_SPEC="%gcc+mpi+cuda~openmp~shared "
274
+ export SPACK_SPEC="%gcc+mpi+cuda~openmp"
270
275
export SPACK_SPEC="${SPACK_SPEC}${SPACK_SHARED_VARIANT} ^vtk-m+cuda${SPACK_SHARED_VARIANT}"
271
276
export SPACK_SPEC="${SPACK_SPEC} ^cmake~openssl~ncurses"
272
277
echo $SPACK_SPEC
Original file line number Diff line number Diff line change @@ -61,11 +61,6 @@ if(NOT ENABLE_SERIAL AND NOT ENABLE_MPI)
61
61
"Please set ENABLE_SERIAL, ENABLE_MPI or both to ON" )
62
62
endif ()
63
63
64
-
65
- if (ENABLE_CUDA AND BUILD_SHARED_LIBS )
66
- message (FATAL_ERROR "Static libraries are required when building with CUDA" )
67
- endif ()
68
-
69
64
if (ENABLE_CUDA)
70
65
# ask politely a few times for SEPARABLE COMPILATION
71
66
set (CMAKE_CUDA_SEPARABLE_COMPILATION ON CACHE BOOL "" )
Original file line number Diff line number Diff line change @@ -64,6 +64,11 @@ if(ENABLE_CUDA AND NOT VTKm_ENABLE_CUDA)
64
64
message (FATAL_ERROR "VTK-h CUDA support requires VTK-m with CUDA support (ENABLE_CUDA == TRUE, however VTKm_ENABLE_CUDA == FALSE" )
65
65
endif ()
66
66
67
+ if (ENABLE_CUDA AND BUILD_SHARED_LIBS )
68
+ if (VTKm_VERSION VERSION_LESS "1.7.0" )
69
+ message (FATAL_ERROR "Cannot build shared libs with CUDA when VTKm is < v1.7.0" )
70
+ endif ()
71
+ endif ()
67
72
68
73
set (VTKM_FOUND TRUE )
69
74
You can’t perform that action at this time.
0 commit comments