From 1599d841c012cfa578cb05a20b15123206b15cf6 Mon Sep 17 00:00:00 2001 From: kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> Date: Wed, 2 Mar 2022 12:17:25 -0600 Subject: ECP-SDK: ParaView 5.11: required for CUDA (#29054) * ECP-SDK: ParaView 5.11: required for CUDA * Add conflict with ParaView@master Because of the additional constraints for cuda, ParaView@master may be selected unintentionally. Prefer older versions of ParaView without cuda to master with cuda. --- .../repos/builtin/packages/ecp-data-vis-sdk/package.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py index d1dfef13a2..c218e6f58c 100644 --- a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py +++ b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py @@ -129,12 +129,17 @@ class EcpDataVisSdk(BundlePackage, CudaPackage): depends_on('py-cinemasci', when='+cinema') - dav_sdk_depends_on('paraview +mpi +python3 +kits', + dav_sdk_depends_on('paraview+mpi+python3+kits+shared', when='+paraview', - propagate=['hdf5', 'adios2'] + cuda_arch_variants) - # Want +shared when not using cuda - depends_on('paraview ~shared +cuda', when='+paraview +cuda') - depends_on('paraview +shared ~cuda', when='+paraview ~cuda') + propagate=['hdf5', 'adios2']) + # ParaView needs @5.11: in order to use cuda and be compatible with other + # SDK packages. + depends_on('paraview +cuda', when='+paraview +cuda ^paraview@5.11:') + for cuda_arch in cuda_arch_variants: + depends_on('paraview {0}'.format(cuda_arch), + when='+paraview {0} ^paraview@5.11:'.format(cuda_arch)) + depends_on('paraview ~cuda', when='+paraview ~cuda') + conflicts('paraview@master') dav_sdk_depends_on('visit', when='+visit') -- cgit v1.2.3-70-g09d2