diff options
Diffstat (limited to 'math/vtk9')
14 files changed, 198 insertions, 96 deletions
diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 85979ec768e3..41087e74f8e4 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,5 @@ PORTNAME= vtk -DISTVERSION= 9.2.6 -PORTREVISION= 6 +DISTVERSION= 9.5.0 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 diff --git a/math/vtk9/Makefile.version b/math/vtk9/Makefile.version index 66ceb4b6ed8f..0704e0637ff9 100644 --- a/math/vtk9/Makefile.version +++ b/math/vtk9/Makefile.version @@ -1,3 +1,3 @@ # this file is provided for VTK users -VTK_VER=9.2 +VTK_VER=9.5 diff --git a/math/vtk9/distinfo b/math/vtk9/distinfo index c73d546ac962..89bd22215236 100644 --- a/math/vtk9/distinfo +++ b/math/vtk9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687488293 -SHA256 (VTK-9.2.6.tar.gz) = 06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12 -SIZE (VTK-9.2.6.tar.gz) = 53810904 +TIMESTAMP = 1750828031 +SHA256 (VTK-9.5.0.tar.gz) = 04ae86246b9557c6b61afbc534a6df099244fbc8f3937f82e6bc0570953af87d +SIZE (VTK-9.5.0.tar.gz) = 50172790 diff --git a/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c b/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c deleted file mode 100644 index 908a0098eced..000000000000 --- a/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c.orig 2022-10-02 11:37:19 UTC -+++ ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c -@@ -287,6 +287,10 @@ if (mta_root == NULL){set_error(ADFH_ERR_ROOTNULL, err - #define CMP_OINFO(r,n) ((r)->fileno==(n)->fileno && \ - (r)->addr==(n)->addr && (r)->addr != HADDR_UNDEF) - -+#if H5_VERSION_GE(1,12,0) -+#undef H5L_info_t -+#define H5L_info_t H5L_info2_t -+#endif - - static herr_t gfind_by_name(hid_t, const char *, const H5L_info_t*, void *); - static herr_t find_by_name(hid_t, const char *, const H5A_info_t*, void *); diff --git a/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h b/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h deleted file mode 100644 index eb9c13efbe2f..000000000000 --- a/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h +++ /dev/null @@ -1,18 +0,0 @@ ---- ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h.orig 2023-02-15 04:03:53 UTC -+++ ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h -@@ -480,6 +480,7 @@ void buffer<T>::append(const U* begin, const U* end) { - } - } // namespace internal - -+#ifdef __cpp_char8_t - // A UTF-8 string view. - class u8string_view : public basic_string_view<char8_t> { - public: -@@ -497,6 +498,7 @@ inline u8string_view operator"" _u(const char* s, std: - } - } // namespace literals - #endif -+#endif // __cpp_char8_t - - // The number of characters to store in the basic_memory_buffer object itself - // to avoid dynamic memory allocation. diff --git a/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_Core b/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_Core new file mode 100644 index 000000000000..9a8e867cba27 --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_Core @@ -0,0 +1,11 @@ +--- ThirdParty/eigen/vtkeigen/eigen/Core.orig 2021-08-18 20:41:58 UTC ++++ ThirdParty/eigen/vtkeigen/eigen/Core +@@ -346,7 +346,7 @@ using std::ptrdiff_t; + #include "src/Core/CoreIterators.h" + #include "src/Core/ConditionEstimator.h" + +-#if defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX) ++#if defined(EIGEN_VECTORIZE_VSX) + #include "src/Core/arch/AltiVec/MatrixProduct.h" + #elif defined EIGEN_VECTORIZE_NEON + #include "src/Core/arch/NEON/GeneralBlockPanelKernel.h" diff --git a/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_Complex.h b/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_Complex.h new file mode 100644 index 000000000000..19f201dd91ed --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_Complex.h @@ -0,0 +1,18 @@ +--- ThirdParty/eigen/vtkeigen/eigen/src/Core/arch/AltiVec/Complex.h.orig 2021-08-18 20:41:58 UTC ++++ ThirdParty/eigen/vtkeigen/eigen/src/Core/arch/AltiVec/Complex.h +@@ -100,6 +100,7 @@ template<> struct packet_traits<std::complex<float> > + HasAbs2 = 0, + HasMin = 0, + HasMax = 0, ++ HasSqrt = 1, + #ifdef __VSX__ + HasBlend = 1, + #endif +@@ -320,6 +321,7 @@ template<> struct packet_traits<std::complex<double> > + HasAbs2 = 0, + HasMin = 0, + HasMax = 0, ++ HasSqrt = 1, + HasSetLinear = 0 + }; + }; diff --git a/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_MathFunctions.h b/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_MathFunctions.h new file mode 100644 index 000000000000..a8c2ff027ad0 --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_MathFunctions.h @@ -0,0 +1,47 @@ +--- ThirdParty/eigen/vtkeigen/eigen/src/Core/arch/AltiVec/MathFunctions.h.orig 2021-08-18 20:41:58 UTC ++++ ThirdParty/eigen/vtkeigen/eigen/src/Core/arch/AltiVec/MathFunctions.h +@@ -40,16 +40,14 @@ Packet4f pcos<Packet4f>(const Packet4f& _x) + return pcos_float(_x); + } + ++#ifdef __VSX__ + #ifndef EIGEN_COMP_CLANG + template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED + Packet4f prsqrt<Packet4f>(const Packet4f& x) + { + return vec_rsqrt(x); + } +-#endif + +-#ifdef __VSX__ +-#ifndef EIGEN_COMP_CLANG + template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED + Packet2d prsqrt<Packet2d>(const Packet2d& x) + { +@@ -73,6 +71,26 @@ template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEF + Packet2d pexp<Packet2d>(const Packet2d& _x) + { + return pexp_double(_x); ++} ++ ++template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){ ++ BF16_TO_F32_UNARY_OP_WRAPPER(psqrt<Packet4f>, a); ++} ++ ++#ifndef EIGEN_COMP_CLANG ++template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){ ++ BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a); ++} ++#endif ++#else ++template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS ++Packet4f psqrt<Packet4f>(const Packet4f& x) ++{ ++ Packet4f a; ++ for (Index i = 0; i < packet_traits<float>::size; i++) { ++ a[i] = numext::sqrt(x[i]); ++ } ++ return a; + } + #endif + diff --git a/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_PacketMath.h b/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_PacketMath.h new file mode 100644 index 000000000000..f8a09e76d845 --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_eigen_vtkeigen_eigen_src_Core_arch_AltiVec_PacketMath.h @@ -0,0 +1,117 @@ +--- ThirdParty/eigen/vtkeigen/eigen/src/Core/arch/AltiVec/PacketMath.h.orig 2021-08-18 20:41:58 UTC ++++ ThirdParty/eigen/vtkeigen/eigen/src/Core/arch/AltiVec/PacketMath.h +@@ -175,16 +175,19 @@ struct packet_traits<float> : default_packet_traits { + #else + HasRsqrt = 0, + #endif ++ HasTanh = EIGEN_FAST_MATH, ++ HasErf = EIGEN_FAST_MATH, ++ HasRint = 1, + #else + HasSqrt = 0, + HasRsqrt = 0, +- HasTanh = EIGEN_FAST_MATH, +- HasErf = EIGEN_FAST_MATH, ++ HasTanh = 0, ++ HasErf = 0, ++ HasRint = 0, + #endif + HasRound = 1, + HasFloor = 1, + HasCeil = 1, +- HasRint = 1, + HasNegate = 1, + HasBlend = 1 + }; +@@ -217,16 +220,17 @@ struct packet_traits<bfloat16> : default_packet_traits + #else + HasRsqrt = 0, + #endif ++ HasRint = 1, + #else + HasSqrt = 0, + HasRsqrt = 0, +- HasTanh = EIGEN_FAST_MATH, +- HasErf = EIGEN_FAST_MATH, ++ HasRint = 0, + #endif ++ HasTanh = 0, ++ HasErf = 0, + HasRound = 1, + HasFloor = 1, + HasCeil = 1, +- HasRint = 1, + HasNegate = 1, + HasBlend = 1 + }; +@@ -872,19 +876,29 @@ template<> EIGEN_STRONG_INLINE Packet4f pcmp_lt_or_nan + return vec_nor(c,c); + } + ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet4i pcmp_le(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet4i pcmp_lt(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet4i pcmp_eq(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8s pcmp_le(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet8s pcmp_lt(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet8s pcmp_eq(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8us pcmp_le(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet8us pcmp_lt(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet8us pcmp_eq(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet16c pcmp_le(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet16c pcmp_lt(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet16c pcmp_eq(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_le(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_lt(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_eq(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmpeq(a,b)); } + +@@ -937,6 +951,7 @@ template<> EIGEN_STRONG_INLINE Packet4f pround<Packet4 + } + template<> EIGEN_STRONG_INLINE Packet4f pceil<Packet4f>(const Packet4f& a) { return vec_ceil(a); } + template<> EIGEN_STRONG_INLINE Packet4f pfloor<Packet4f>(const Packet4f& a) { return vec_floor(a); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet4f print<Packet4f>(const Packet4f& a) + { + Packet4f res; +@@ -947,6 +962,7 @@ template<> EIGEN_STRONG_INLINE Packet4f print<Packet4f + + return res; + } ++#endif + + template<typename Packet> EIGEN_STRONG_INLINE Packet ploadu_common(const __UNPACK_TYPE__(Packet)* from) + { +@@ -1341,12 +1357,6 @@ template<> EIGEN_STRONG_INLINE Packet8bf psub<Packet8b + BF16_TO_F32_BINARY_OP_WRAPPER(psub<Packet4f>, a, b); + } + +-template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){ +- BF16_TO_F32_UNARY_OP_WRAPPER(vec_sqrt, a); +-} +-template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){ +- BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a); +-} + template<> EIGEN_STRONG_INLINE Packet8bf pexp<Packet8bf> (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(pexp_float, a); + } +@@ -1390,9 +1400,11 @@ template<> EIGEN_STRONG_INLINE Packet8bf pceil<Packet8 + template<> EIGEN_STRONG_INLINE Packet8bf pround<Packet8bf> (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(pround<Packet4f>, a); + } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8bf print<Packet8bf> (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(print<Packet4f>, a); + } ++#endif + template<> EIGEN_STRONG_INLINE Packet8bf pmadd(const Packet8bf& a, const Packet8bf& b, const Packet8bf& c) { + Packet4f a_even = Bf16ToF32Even(a); + Packet4f a_odd = Bf16ToF32Odd(a); diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c deleted file mode 100644 index eb29a277f139..000000000000 --- a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c +++ /dev/null @@ -1,14 +0,0 @@ -- fix build with science/netcdf 4.9.3 -- see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284680 - ---- ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c.orig 2025-02-10 02:00:23 UTC -+++ ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c -@@ -243,7 +243,7 @@ int ex_put_prop(int exoid, ex_entity_type obj_type, ex - vals[0] = 0; /* fill value */ - /* create attribute to cause variable to fill with zeros per routine spec - */ -- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) { -+ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) { - snprintf(errmsg, MAX_ERR_LENGTH, - "ERROR: failed to create property name fill attribute in file id %d", exoid); - ex_err_fn(exoid, __func__, errmsg, status); diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c deleted file mode 100644 index 335822e40906..000000000000 --- a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c +++ /dev/null @@ -1,14 +0,0 @@ -- fix build with science/netcdf 4.9.3 -- see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284680 - ---- ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c.orig 2025-02-10 02:01:23 UTC -+++ ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c -@@ -172,7 +172,7 @@ int ex_put_prop_names(int exoid, ex_entity_type obj_ty - - /* create attribute to cause variable to fill with zeros per routine spec - */ -- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) { -+ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) { - snprintf(errmsg, MAX_ERR_LENGTH, - "ERROR: failed to create property name fill attribute in file id %d", exoid); - ex_err_fn(exoid, __func__, errmsg, status); diff --git a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c deleted file mode 100644 index 65889826bdd6..000000000000 --- a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ThirdParty/glew/vtkglew/src/glew.c.orig 2024-02-21 22:29:42 UTC -+++ ThirdParty/glew/vtkglew/src/glew.c -@@ -38,6 +38,7 @@ - - #if defined(GLEW_OSMESA) - # define GLAPI extern -+# define APIENTRY __stdcall - # include <GL/osmesa.h> - #elif defined(GLEW_EGL) - # include <GL/eglew.h> diff --git a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c deleted file mode 100644 index 0ea9659d6ec5..000000000000 --- a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ThirdParty/glew/vtkglew/src/glewinfo.c.orig 2024-02-21 22:29:54 UTC -+++ ThirdParty/glew/vtkglew/src/glewinfo.c -@@ -38,6 +38,7 @@ - #include <GL/eglew.h> - #elif defined(GLEW_OSMESA) - #define GLAPI extern -+#define APIENTRY __stdcall - #include <GL/osmesa.h> - #elif defined(_WIN32) - #include <GL/wglew.h> diff --git a/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx b/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx deleted file mode 100644 index de91955442bb..000000000000 --- a/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx +++ /dev/null @@ -1,11 +0,0 @@ ---- Utilities/octree/octree/octree_node.txx.orig 2023-02-15 04:03:53 UTC -+++ Utilities/octree/octree/octree_node.txx -@@ -207,7 +207,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_> - { - throw std::domain_error("Attempt to access children of an octree leaf node."); - } -- return this->_M_chilren[child]; -+ return this->m_children[child]; - } - - /**\brief Return a reference to a child node. |