Skip to content

Commit ed7e36f

Browse files
ParaView: Drop constraint on cuda version for newer VTKm/Viskores
1 parent 1dd4f1d commit ed7e36f

File tree

1 file changed

+3
-4
lines changed
  • repos/spack_repo/builtin/packages/paraview

1 file changed

+3
-4
lines changed

repos/spack_repo/builtin/packages/paraview/package.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
280280
conflicts(f"cuda_arch={_arch}", when="+cuda", msg="ParaView requires cuda_arch >= 20")
281281

282282
# Starting from [email protected], CUDA architecture managament can be delegated to CMake.
283-
# Hence, it is possible to rely on it instead of relying on custom logic updates from VTK-m for
284-
# newer architectures (wrt mapping).
283+
# Hence, it is possible to rely on it instead of relying on custom logic updates from
284+
# VTK-m for newer architectures (wrt mapping).
285285
pattern = re.compile(r"\d+")
286286
for _arch in CudaPackage.cuda_arch_values:
287287
_number = re.match(pattern, _arch).group()
@@ -306,7 +306,6 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
306306
when="+rocm amdgpu_target={0}".format(target),
307307
)
308308

309-
310309
with when("@6:"):
311310
# ParaView 6 and later will not support Spack builds with Qt5.
312311
with when("+qt"):
@@ -413,7 +412,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
413412
depends_on("[email protected]", when="@5.11:")
414413

415414
# Patches to vendored VTK-m are needed for forward compat with CUDA 12 (mr 2972 and 3259)
416-
depends_on("cuda@:11", when="+cuda")
415+
depends_on("cuda@:11", when="@5.3:5.12 +cuda")
417416

418417
patch("stl-reader-pv440.patch", when="@4.4.0")
419418

0 commit comments

Comments
 (0)