diff options
3 files changed, 28 insertions, 7 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml index 1799e7e521..04071d990b 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml @@ -240,7 +240,6 @@ spack: - umpire ~shared +cuda cuda_arch=75 # INCLUDED IN ECP DAV CUDA - adios2 +cuda cuda_arch=75 - - paraview +cuda cuda_arch=75 - vtk-m +cuda cuda_arch=75 - zfp +cuda cuda_arch=75 # -- @@ -248,6 +247,7 @@ spack: # - axom +cuda cuda_arch=75 # axom: https://github.com/spack/spack/issues/29520 # - cusz +cuda cuda_arch=75 # cusz: https://github.com/spack/spack/issues/38787 # - dealii +cuda cuda_arch=75 # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'. + # - paraview +cuda cuda_arch=75 # Error building some cuda componets in paraview # - ecp-data-vis-sdk +adios2 +hdf5 +vtkm +zfp +paraview +cuda cuda_arch=75 # embree: https://github.com/spack/spack/issues/39534 # - lammps +cuda cuda_arch=75 # lammps: needs NVIDIA driver # - lbann +cuda cuda_arch=75 # lbann: https://github.com/spack/spack/issues/38788 @@ -287,7 +287,6 @@ spack: - umpire ~shared +cuda cuda_arch=80 # INCLUDED IN ECP DAV CUDA - adios2 +cuda cuda_arch=80 - - paraview +cuda cuda_arch=80 - vtk-m +cuda cuda_arch=80 - zfp +cuda cuda_arch=80 # -- @@ -295,6 +294,7 @@ spack: # - axom +cuda cuda_arch=80 # axom: https://github.com/spack/spack/issues/29520 # - cusz +cuda cuda_arch=80 # cusz: https://github.com/spack/spack/issues/38787 # - dealii +cuda cuda_arch=80 # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'. + # - paraview +cuda cuda_arch=80 # Error building some cuda componets in paraview # - ecp-data-vis-sdk +adios2 +hdf5 +vtkm +zfp +paraview +cuda cuda_arch=80 # embree: https://github.com/spack/spack/issues/39534 # - lammps +cuda cuda_arch=80 # lammps: needs NVIDIA driver # - lbann +cuda cuda_arch=80 # lbann: https://github.com/spack/spack/issues/38788 diff --git a/var/spack/repos/builtin/packages/paraview/kits_with_catalyst_5_12.patch b/var/spack/repos/builtin/packages/paraview/kits_with_catalyst_5_12.patch new file mode 100644 index 0000000000..f61767fd64 --- /dev/null +++ b/var/spack/repos/builtin/packages/paraview/kits_with_catalyst_5_12.patch @@ -0,0 +1,21 @@ +From 65ec5b0604576474141def0ba7f0c7b94f6b32ee Mon Sep 17 00:00:00 2001 +From: Ryan Krattiger <ryan.krattiger@kitware.com> +Date: Fri, 8 Mar 2024 09:17:03 -0600 + +--- + VTK/IO/CatalystConduit/vtk.module | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/VTK/IO/CatalystConduit/vtk.module b/VTK/IO/CatalystConduit/vtk.module +index c67f5a099d5..18e706e8c9f 100644 +--- a/VTK/IO/CatalystConduit/vtk.module ++++ b/VTK/IO/CatalystConduit/vtk.module +@@ -5,7 +5,7 @@ LIBRARY_NAME + DESCRIPTION + Catalyst implementation for VTK, including Conduit to/from VTK conversion. + KIT +- VTK::IO ++ VTK::Parallel + SPDX_LICENSE_IDENTIFIER + BSD-3-Clause + SPDX_COPYRIGHT_TEXT diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 79f2e847c3..2c5882e2a9 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -31,13 +31,11 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): version("master", branch="master", submodules=True) version( - "5.12.0-RC3", sha256="6aaa46ff295126707294482e6ba24bd0ec0d68cf6bb5f56f145f8bcc53fc3f70" - ) - version( - "5.11.2", - sha256="5c5d2f922f30d91feefc43b4a729015dbb1459f54c938896c123d2ac289c7a1e", + "5.12.0", + sha256="d289afe7b48533e2ca4a39a3b48d3874bfe67cf7f37fdd2131271c57e64de20d", preferred=True, ) + version("5.11.2", sha256="5c5d2f922f30d91feefc43b4a729015dbb1459f54c938896c123d2ac289c7a1e") version("5.11.1", sha256="5cc2209f7fa37cd3155d199ff6c3590620c12ca4da732ef7698dec37fa8dbb34") version("5.11.0", sha256="9a0b8fe8b1a2cdfd0ace9a87fa87e0ec21ee0f6f0bcb1fdde050f4f585a25165") version("5.10.1", sha256="520e3cdfba4f8592be477314c2f6c37ec73fb1d5b25ac30bdbd1c5214758b9c2") @@ -319,6 +317,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): patch("exodusII-netcdf4.9.0.patch", when="@5.10.0:5.10.2") + patch("kits_with_catalyst_5_12.patch", when="@5.12.0") + generator("ninja", "make", default="ninja") # https://gitlab.kitware.com/paraview/paraview/-/issues/21223 conflicts("generator=ninja", when="%xl") |