From b7024010d3c33db2fd7a8e84bec4094d47db3794 Mon Sep 17 00:00:00 2001 From: kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:09:56 -0500 Subject: SDK: Quick fix to allow SDK to build with HIP (#32321) --- var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 a74b4ae8d2..6bd0b7e0b3 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,6 +125,8 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): when="+ascent", propagate=["adios2", "cuda"] + cuda_arch_variants, ) + depends_on("ascent+openmp", when="~rocm+ascent") + depends_on("ascent~openmp", when="+rocm+ascent") # Need to explicitly turn off conduit hdf5_compat in order to build # hdf5@1.12 which is required for SDK @@ -152,10 +154,12 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): dav_sdk_depends_on("visit+mpi+python+silo", when="+visit", propagate=["hdf5", "adios2"]) dav_sdk_depends_on( - "vtk-m@1.7:+shared+mpi+openmp+rendering", + "vtk-m@1.7:+shared+mpi+rendering", when="+vtkm", propagate=["cuda", "rocm"] + cuda_arch_variants + amdgpu_target_variants, ) + depends_on("vtk-m+openmp", when="~rocm+vtkm") + depends_on("vtk-m~openmp", when="+rocm+vtkm") # +python is currently broken in sz # dav_sdk_depends_on('sz+shared+fortran+python+random_access', -- cgit v1.2.3-70-g09d2