zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paraview: add v5.13.3 (#49818)

Browse Source 
* Revert "paraview: add patch for Intel Classic compilers (#49116)"

This reverts commit 7a95e2beb5.

We'll mark Intel Classic compilers as conflicting with ParaView
versions 5.13.0-5.13.2 instead since 5.13.3 is available and can be
built with with those compilers.

* Add conflict for Intel Class compilers and ParaView 5.13.0-5.13.2.

* paraview: add new v5.13.3 release
This commit is contained in:
Cory Quammen 2025-04-02 11:53:19 -04:00 committed by GitHub
parent 73034c163b
commit 528ba74965
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/paraview/package.py
View File

@ -34,10 +34,11 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
version("master", branch="master", submodules=True)
version(
"5.13.2",
sha256="4e116250f8e1a9c480f97c5696c9cd72b4d4998b039ca46da8b224f27445f13e",
"5.13.3",
sha256="3bd31bb56e07aa2af2a379895745bbc430c565518a363d935f2efc35b076df09",
preferred=True,
)
version("5.13.2", sha256="4e116250f8e1a9c480f97c5696c9cd72b4d4998b039ca46da8b224f27445f13e")
version("5.13.1", sha256="a16503ce37b999c2967d84234596e7bf67ac98221851a288bb1399c7e1dc2004")
version("5.13.0", sha256="886f530bebd6b24c6a7f8a5f4b1afa72c53d4737ccaa4b5fd5946b4e5a758c91")
version("5.12.1", sha256="927f880c13deb6dde4172f4727d2b66f5576e15237b35778344f5dd1ddec863e")
@ -361,11 +362,6 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
# intel oneapi doesn't compile some code in catalyst
patch("catalyst-etc_oneapi_fix.patch", when="@5.10.0:5.10.1%oneapi")
# Classic Intel compilers don't compile some code in vtkFFT.txx
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11928
# Applying it for every compiler is fine.
patch("vtk-fft-icc.patch", when="@5.12.0:5.13.2")
# Patch for paraview 5.8: ^hdf5@1.13.2:
# Even with ~hdf5, hdf5 is part of the dependency tree due to netcdf-c
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9690
@ -397,6 +393,9 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
conflicts("generator=ninja", when="%xl")
conflicts("generator=ninja", when="%xl_r")
# Versions 5.13.0-5.13.2 do not compile with Intel classic compilers
conflicts("%intel", when="@5.13:5.13.2")
def url_for_version(self, version):
_urlfmt = "http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.{3}"
# Handle ParaView version-based custom URLs

13
var/spack/repos/builtin/packages/paraview/vtk-fft-icc.patch
View File

@ -1,13 +0,0 @@
diff --git a/VTK/Common/Math/vtkFFT.txx b/VTK/Common/Math/vtkFFT.txx
index 043812a2f32..8c8410aeee9 100644
--- a/VTK/Common/Math/vtkFFT.txx
+++ b/VTK/Common/Math/vtkFFT.txx
@@ -327,6 +327,6 @@ vtkSmartPointer<vtkFFT::vtkScalarNumberArray> vtkFFT::Csd(vtkScalarNumberArray*
vtkSMPTools::Fill(averageRange.begin(), averageRange.end(), 0.0);
auto resRange = vtk::DataArrayTupleRange(result);
- using ConstTupleRef = decltype(resRange)::ConstTupleReferenceType;
+ using ConstTupleRef = typename decltype(resRange)::ConstTupleReferenceType;
for (unsigned int i = 0; i < shape[0]; ++i)
{
auto begin = resRange.cbegin() + i * shape[1];