diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py | 18 |
1 files changed, 6 insertions, 12 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 a211b3e855..bf34748f45 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 @@ -125,14 +125,12 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): dav_sdk_depends_on('sensei@develop +vtkio +python ~miniapps', when='+sensei', propagate=dict(propagate_to_sensei)) - dav_sdk_depends_on('ascent+mpi+fortran+openmp+python+shared+vtkh+dray', + dav_sdk_depends_on('ascent+mpi+fortran+openmp+python+shared+vtkh+dray~test', when='+ascent', - propagate=['adios2'] + cuda_arch_variants) + propagate=['adios2', 'cuda'] + cuda_arch_variants) # Need to explicitly turn off conduit hdf5_compat in order to build # hdf5@1.12 which is required for SDK depends_on('ascent ^conduit ~hdf5_compat', when='+ascent +hdf5') - depends_on('ascent~cuda', when='+ascent~cuda') - depends_on('ascent+cuda', when='+ascent+cuda ^vtk-m@1.7:') # Disable configuring with @develop. This should be removed after ascent # releases 0.8 and ascent can build with conduit@0.8: and vtk-m@1.7: conflicts('ascent@develop') @@ -153,15 +151,11 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): dav_sdk_depends_on('visit', when='+visit') - dav_sdk_depends_on('vtk-m+shared+mpi+openmp+rendering', + dav_sdk_depends_on('vtk-m@1.7:+shared+mpi+openmp+rendering', when='+vtkm', - propagate=['cuda'] + cuda_arch_variants) - depends_on('vtk-m +rocm', when='+vtkm +rocm ^vtk-m@1.7:') - for amdgpu_target in amdgpu_target_variants: - depends_on('vtk-m {0}'.format(amdgpu_target), - when='+vtkm {0} ^vtk-m@1.7:'.format(amdgpu_target)) - - # depends_on('vtk-m ~rocm', when='+vtkm +rocm ^vtk-m@:1.6') + propagate=['cuda', 'rocm'] + + cuda_arch_variants + + amdgpu_target_variants) # +python is currently broken in sz # dav_sdk_depends_on('sz+shared+fortran+python+random_access', |