summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com>2023-04-14 09:55:46 -0500
committerGitHub <noreply@github.com>2023-04-14 16:55:46 +0200
commit3710774d0271abb143c23abf8c6c0d6f4a7f17a9 (patch)
tree3ffc27545f709f97052dac7339cd593e1d09a442
parent32808f4fb51196634a6529e75ce2d81a7e3de229 (diff)
downloadspack-3710774d0271abb143c23abf8c6c0d6f4a7f17a9.tar.gz
spack-3710774d0271abb143c23abf8c6c0d6f4a7f17a9.tar.bz2
spack-3710774d0271abb143c23abf8c6c0d6f4a7f17a9.tar.xz
spack-3710774d0271abb143c23abf8c6c0d6f4a7f17a9.zip
VTK-m: use conflict with virtuals variant with ROCm (#36845)
-rw-r--r--var/spack/repos/builtin/packages/vtk-m/package.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/vtk-m/package.py b/var/spack/repos/builtin/packages/vtk-m/package.py
index b60f1109b7..11b576415e 100644
--- a/var/spack/repos/builtin/packages/vtk-m/package.py
+++ b/var/spack/repos/builtin/packages/vtk-m/package.py
@@ -64,7 +64,10 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
variant("logging", default=False, description="build logging support")
variant("ascent_types", default=True, description="build support for ascent types")
variant(
- "virtuals", default=False, description="enable support for deprecated virtual functions"
+ "virtuals",
+ default=False,
+ description="enable support for deprecated virtual functions",
+ when="@:1.9",
)
variant("mpi", default=False, description="build mpi support")
variant("rendering", default=True, description="build rendering support")
@@ -124,6 +127,7 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
conflicts("+rocm", when="@:1.6")
conflicts("+rocm", when="+cuda")
conflicts("+rocm", when="~kokkos", msg="VTK-m does not support HIP without Kokkos")
+ conflicts("+rocm", when="+virtuals", msg="VTK-m does not support virtual functions with ROCm")
# Can build +shared+cuda after @1.7:
conflicts("+shared", when="@:1.6 +cuda_native")
@@ -251,8 +255,6 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
# hip support
if "+rocm" in spec:
- options.append("-DVTKm_NO_DEPRECATED_VIRTUAL:BOOL=ON")
-
archs = ",".join(self.spec.variants["amdgpu_target"].value)
options.append("-DCMAKE_HIP_ARCHITECTURES:STRING={0}".format(archs))