hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ParaView: add use_vtkm as a multi-valued variant (#21977)

Browse source 
spelling fixes
This commit is contained in:
Ethan Stam 2022-02-22 07:17:18 -07:00 committed by GitHub
parent aca6b73a6c
commit 0d3ecff903
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
var/spack/repos/builtin/packages/paraview/package.py
View file

@ -12,7 +12,7 @@
class Paraview(CMakePackage, CudaPackage): class Paraview(CMakePackage, CudaPackage):
"""ParaView is an open-source, multi-platform data analysis and """ParaView is an open-source, multi-platform data analysis and
visualization application. This package includes the Catalyst visualization application. This package includes the Catalyst
in-situ library for versions 5.7 and greater, othewise use the in-situ library for versions 5.7 and greater, otherwise use the
catalyst package. catalyst package.
""" """
@ -70,6 +70,10 @@ class Paraview(CMakePackage, CudaPackage):
'catalyst', 'rendering', 'core'), 'catalyst', 'rendering', 'core'),
description='Build editions include only certain modules. ' description='Build editions include only certain modules. '
'Editions are listed in decreasing order of size.') 'Editions are listed in decreasing order of size.')
variant('use_vtkm', default='default', multi=False, values=('default', 'on', 'off'),
description='Build VTK-m with ParaView by setting PARAVIEW_USE_VTKM=ON,OFF.'
' "default" lets the build_edition make the decision.'
' "on" or "off" will always override the build_edition.')
conflicts('+adios2', when='@:5.10 ~mpi') conflicts('+adios2', when='@:5.10 ~mpi')
conflicts('+python', when='+python3') conflicts('+python', when='+python3')
@ -85,6 +89,8 @@ class Paraview(CMakePackage, CudaPackage):
conflicts('build_edition=catalyst', when='@:5.7') conflicts('build_edition=catalyst', when='@:5.7')
conflicts('build_edition=rendering', when='@:5.7') conflicts('build_edition=rendering', when='@:5.7')
conflicts('build_edition=core', when='@:5.7') conflicts('build_edition=core', when='@:5.7')
# before 5.3.0, ParaView didn't have VTK-m
conflicts('use_vtkm=on', when='@:5.3')
# We only support one single Architecture # We only support one single Architecture
for _arch, _other_arch in itertools.permutations(CudaPackage.cuda_arch_values, 2): for _arch, _other_arch in itertools.permutations(CudaPackage.cuda_arch_values, 2):
@ -418,6 +424,11 @@ def nvariant_bool(feature):
cmake_args.append( cmake_args.append(
'-DPARAVIEW_BUILD_SHARED_LIBS:BOOL=%s' % variant_bool('+shared')) '-DPARAVIEW_BUILD_SHARED_LIBS:BOOL=%s' % variant_bool('+shared'))
# VTK-m added to ParaView in 5.3.0 and up
if spec.satisfies('@5.3.0:') and spec.variants['use_vtkm'].value != 'default':
cmake_args.append('-DPARAVIEW_USE_VTKM:BOOL=%s' %
spec.variants['use_vtkm'].value.upper())
if spec.satisfies('@5.8:'): if spec.satisfies('@5.8:'):
cmake_args.append('-DPARAVIEW_USE_CUDA:BOOL=%s' % cmake_args.append('-DPARAVIEW_USE_CUDA:BOOL=%s' %
variant_bool('+cuda')) variant_bool('+cuda'))