ParaView: Update to use Viskores

Co-authored-by: Kenneth Moreland <[email protected]>

Author: kwryankrattiger

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

@@ -40,6 +40,10 @@
 }
 
 
+# This is a list of paraview variants that require the viskores library.
+viskores_dependency_variants = ["+cuda", "+fides", "+rocm"]
+
+
 class Paraview(CMakePackage, CudaPackage, ROCmPackage):
     """ParaView is an open-source, multi-platform data analysis and
     visualization application. This package includes the Catalyst
@@ -166,6 +170,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "use_vtkm",
         default="default",
+        when="@5.3.0:5.13",
         multi=False,
         values=("default", "on", "off"),
         description="Build VTK-m(Viskores) with ParaView."
@@ -193,8 +198,9 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
     conflicts("build_edition=catalyst", when="@:5.7")
     conflicts("build_edition=rendering", when="@:5.7")
     conflicts("build_edition=core", when="@:5.7")
-    # before 5.3.0, ParaView didn't have VTK-m
-    conflicts("use_vtkm=on", when="@:5.3")
+    # before 5.3.0, ParaView didn't have VTK-m/Viskores
+    conflicts("+cuda", when="@:5.3")
+    conflicts("+rocm", when="@:5.3")
     # [email protected] is recommended when using the xl compiler
     # See https://gitlab.kitware.com/paraview/paraview/-/merge_requests/4433
     conflicts(
@@ -203,29 +209,6 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
         msg="Use [email protected] with %xl_r. Earlier versions are not able to build with xl.",
     )
 
-    # CUDA ARCH
-
-    # VTK-m and transitively ParaView does not support Tesla Arch
-    for _arch in ("10", "11", "12", "13"):
-        conflicts(f"cuda_arch={_arch}", when="+cuda", msg="ParaView requires cuda_arch >= 20")
-
-    # Starting from [email protected], CUDA architecture managament can be delegated to CMake.
-    # Hence, it is possible to rely on it instead of relying on custom logic updates from VTK-m for
-    # newer architectures (wrt mapping).
-    pattern = re.compile(r"\d+")
-    for _arch in CudaPackage.cuda_arch_values:
-        _number = re.match(pattern, _arch).group()
-        if int(_number) > 86:
-            conflicts("cmake@:3.17", when=f"cuda_arch={_arch}")
-
-    # We only support one single Architecture
-    for _arch, _other_arch in itertools.permutations(CudaPackage.cuda_arch_values, 2):
-        conflicts(
-            "cuda_arch={0}".format(_arch),
-            when="cuda_arch={0}".format(_other_arch),
-            msg="Paraview only accepts one architecture value",
-        )
-
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated
     depends_on("fortran", type="build")  # generated
@@ -290,6 +273,40 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
         depends_on("[email protected]:", when="~opengl2")
         depends_on("glew")
 
+        # CUDA ARCH
+
+        # VTK-m and transitively ParaView does not support Tesla Arch
+        for _arch in ("10", "11", "12", "13"):
+            conflicts(f"cuda_arch={_arch}", when="+cuda", msg="ParaView requires cuda_arch >= 20")
+
+        # Starting from [email protected], CUDA architecture managament can be delegated to CMake.
+        # Hence, it is possible to rely on it instead of relying on custom logic updates from VTK-m for
+        # newer architectures (wrt mapping).
+        pattern = re.compile(r"\d+")
+        for _arch in CudaPackage.cuda_arch_values:
+            _number = re.match(pattern, _arch).group()
+            if int(_number) > 86:
+                conflicts("cmake@:3.17", when=f"cuda_arch={_arch}")
+
+        # We only support one single Architecture
+        for _arch, _other_arch in itertools.permutations(CudaPackage.cuda_arch_values, 2):
+            conflicts(
+                "cuda_arch={0}".format(_arch),
+                when="cuda_arch={0}".format(_other_arch),
+                msg="Paraview only accepts one architecture value",
+            )
+
+        # Dependencies for vendored VTK-m
+        depends_on("[email protected]:", when="+rocm")
+        # CUDA thrust is already include in the CUDA pkg
+        depends_on("rocthrust", when="@5.13: +rocm ^[email protected]:")
+        for target in ROCmPackage.amdgpu_targets:
+            depends_on(
+                "kokkos@:3.7 +rocm amdgpu_target={0}".format(target),
+                when="+rocm amdgpu_target={0}".format(target),
+            )
+
+
     with when("@6:"):
         # ParaView 6 and later will not support Spack builds with Qt5.
         with when("+qt"):
@@ -307,8 +324,21 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
         # * OSMesa (guarenteed to exist and work on all systems)
         depends_on("osmesa", type=("run"), when="~qt")
 
-        # ParaView 6 (with VTK) supports external Viskores
-        depends_on("viskores", when="use_vtkm=on")
+        # Depend on Viskores when it is needed
+        for vk_variant in viskores_dependency_variants:
+            depends_on("viskores +vtktypes +64bitids +doubleprecision", when=f"{vk_variant}")
+            depends_on("viskores +fpic", when=f"+shared {vk_variant}")
+
+        with when("+cuda"):
+            # Kokkos vs Viskores Native CUDA is intentionally left configurable
+            depends_on("viskores +cuda")
+            for _arch in CudaPackage.cuda_arch_values:
+                depends_on(f"viskores cuda_arch={_arch}", when=f"cuda_arch={_arch}")
+
+        with when("+rocm"):
+            depends_on("viskores +rocm")
+            for target in ROCmPackage.amdgpu_targets:
+                depends_on(f"viskores amdgpu_target={target}", when=f"amdgpu_target={target}")
 
     depends_on("[email protected]:2", when="+raytracing")
     depends_on("openimagedenoise", when="+raytracing")
@@ -361,14 +391,6 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("xz")
     depends_on("zlib-api")
     depends_on("libcatalyst@2:", when="+libcatalyst")
-    depends_on("[email protected]:", when="+rocm")
-    # CUDA thrust is already include in the CUDA pkg
-    depends_on("rocthrust", when="@5.13: +rocm ^[email protected]:")
-    for target in ROCmPackage.amdgpu_targets:
-        depends_on(
-            "kokkos@:3.7 +rocm amdgpu_target={0}".format(target),
-            when="+rocm amdgpu_target={0}".format(target),
-        )
 
     # Older builds of pugi export their symbols differently,
     # and pre-5.9 is unable to handle that.
@@ -719,7 +741,7 @@ def use_x11():
         cmake_args.append("-DPARAVIEW_BUILD_SHARED_LIBS:BOOL=%s" % variant_bool("+shared"))
 
         # VTK-m added to ParaView in 5.3.0 and up
-        if spec.satisfies("@5.3.0:") and spec.variants["use_vtkm"].value != "default":
+        if spec.satisfies("@5.3.0:5") and spec.variants["use_vtkm"].value != "default":
             if spec.satisfies("@6:"):
                 cmake_args.append(
                     "-DPARAVIEW_USE_VISKORES:BOOL=%s" % spec.variants["use_vtkm"].value.upper()
@@ -729,6 +751,17 @@ def use_x11():
                     "-DPARAVIEW_USE_VTKM:BOOL=%s" % spec.variants["use_vtkm"].value.upper()
                 )
 
+        # Viskores added to ParaView in 6.0.0 and up
+        use_viskores = False
+        if spec.satisfies("@6:"):
+            for variant in viskores_dependency_variants:
+                use_viskores |= spec.satisfies(variant)
+        if use_viskores:
+            cmake_args.append("-DPARAVIEW_USE_VISKORES:BOOL=ON")
+            cmake_args.append("-DVTK_MODULE_USE_EXTERNAL_VTK_vtkviskores:BOOL=ON")
+        else:
+            cmake_args.append("-DPARAVIEW_USE_VISKORES:BOOL=OFF")
+
         if spec.satisfies("@5.8:"):
             cmake_args.append("-DPARAVIEW_USE_CUDA:BOOL=%s" % variant_bool("+cuda"))
         elif spec.satisfies("@5.7:"):
@@ -805,14 +838,22 @@ def use_x11():
         if "+advanced_debug" in spec:
             cmake_args.append("-DVTK_DEBUG_LEAKS:BOOL=ON")
 
-        if spec.satisfies("@5.11:"):
+        # Configure ROCM/Kokkos
+        if spec.satisfies("@5.11:5"):
             cmake_args.append("-DPARAVIEW_USE_HIP:BOOL=%s" % variant_bool("+rocm"))
-            if "+rocm" in spec:
-                archs = spec.variants["amdgpu_target"].value
-                if archs != "none":
-                    arch_str = ",".join(archs)
-                    cmake_args.append("-DCMAKE_HIP_ARCHITECTURES=%s" % arch_str)
-                cmake_args.append("-DKokkos_CXX_COMPILER=%s" % spec["hip"].hipcc)
+        elif spec.satsifies("@6:"):
+            cmake_args.append("-DPARAVIEW_USE_KOKKOS:BOOL=%s" % variant_bool("+rocm"))
+
+        if "+rocm" in spec:
+            if spec.satisfies("@6:"):
+                cmake_args.append("-DPARAVIEW_KOKKOS_BACKEND:STRING=HIP")
+
+            archs = spec.variants["amdgpu_target"].value
+
+            if archs != "none":
+                arch_str = ",".join(archs)
+                cmake_args.append("-DCMAKE_HIP_ARCHITECTURES=%s" % arch_str)
+            cmake_args.append("-DKokkos_CXX_COMPILER=%s" % spec["hip"].hipcc)
 
         if "+catalyst" in spec:
             cmake_args.append("-DVTK_MODULE_ENABLE_ParaView_Catalyst=YES")

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

@@ -95,7 +95,7 @@ class Viskores(CMakePackage, CudaPackage, ROCmPackage):
             when="+kokkos +rocm amdgpu_target=%s" % amdgpu_value,
         )
 
-    depends_on("hip@3.7:", when="+rocm")
+    depends_on("hip@5.2:", when="+rocm")
     # CUDA thrust is already include in the CUDA pkg
     depends_on("rocthrust", when="+kokkos+rocm ^[email protected]:")