diff options
author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2022-01-17 06:57:43 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-17 13:57:43 +0100 |
commit | 7e3677db6f6b780049e65133793df65a49718395 (patch) | |
tree | 25c981b37b6f13a683e319ffad6678f598207e1a | |
parent | b2f92a130776fbb9c179c47033cdacfad931a4bb (diff) | |
download | spack-7e3677db6f6b780049e65133793df65a49718395.tar.gz spack-7e3677db6f6b780049e65133793df65a49718395.tar.bz2 spack-7e3677db6f6b780049e65133793df65a49718395.tar.xz spack-7e3677db6f6b780049e65133793df65a49718395.zip |
Fix issue when propagating cuda with other variant (#28377)
+cuda was hiding propagation of hdf5 and adios2 to paraview
-rw-r--r-- | var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py | 13 |
1 files changed, 5 insertions, 8 deletions
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 ae3b2f33d4..fcaeb79b24 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 @@ -119,15 +119,12 @@ class EcpDataVisSdk(BundlePackage, CudaPackage): depends_on('py-cinemasci', when='+cinema') - paraview_base_spec = 'paraview +mpi +python3 +kits' + dav_sdk_depends_on('paraview +mpi +python3 +kits', + when='+paraview', + propagate=['hdf5', 'adios2'] + cuda_arch_variants) # Want +shared when not using cuda - dav_sdk_depends_on(paraview_base_spec + '+shared ~cuda', - when='+paraview ~cuda', - propagate=['hdf5', 'adios2']) - # Can't have +shared when using cuda, propagate cuda_arch_variants - dav_sdk_depends_on(paraview_base_spec + '~shared +cuda', - when='+paraview +cuda', - propagate=cuda_arch_variants) + dav_sdk_depends_on('paraview ~shared +cuda', when='+paraview +cuda') + dav_sdk_depends_on('paraview +shared ~cuda', when='+paraview ~cuda') dav_sdk_depends_on('visit', when='+visit') |