From c6c74e98ffcf82ecd99522dffe67c03764aed482 Mon Sep 17 00:00:00 2001 From: kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> Date: Tue, 29 Nov 2022 11:28:32 -0600 Subject: [PATCH] Dav sdk catalyst (#34010) * SDK: Add Catalyst 1 and 2 support to the SDK * LibCatalyst: Remove unused python3 variant from package --- .../repos/builtin/packages/ecp-data-vis-sdk/package.py | 6 +++++- var/spack/repos/builtin/packages/libcatalyst/package.py | 1 - 2 files changed, 5 insertions(+), 2 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 2c6a89738fa..a1bb7a25792 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 @@ -156,8 +156,12 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): depends_on("py-cinemasci", when="+cinema") dav_sdk_depends_on( - "paraview@5.10:+mpi+python+kits+shared", when="+paraview", propagate=["hdf5", "adios2"] + "paraview@5.10:+mpi+python+kits+shared+catalyst+libcatalyst", + when="+paraview", + propagate=["hdf5", "adios2"], ) + dav_sdk_depends_on("libcatalyst+mpi", when="+paraview") + # ParaView needs @5.11: in order to use cuda and be compatible with other # SDK packages. depends_on("paraview +cuda", when="+paraview +cuda ^paraview@5.11:") diff --git a/var/spack/repos/builtin/packages/libcatalyst/package.py b/var/spack/repos/builtin/packages/libcatalyst/package.py index 07f0bf4f1c1..a166fd34457 100644 --- a/var/spack/repos/builtin/packages/libcatalyst/package.py +++ b/var/spack/repos/builtin/packages/libcatalyst/package.py @@ -22,7 +22,6 @@ class Libcatalyst(CMakePackage): version("2021-05-12", commit="8456ccd6015142b5a7705f79471361d4f5644fa7") variant("mpi", default=False, description="Enable MPI support") - variant("python3", default=False, description="Enable Python3 support") depends_on("mpi", when="+mpi")