From nobody Mon Jun 3 15:12:36 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VtHK253xlz5MgQp; Mon, 03 Jun 2024 15:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VtHK12mGNz4ssC; Mon, 3 Jun 2024 15:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717427557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sVdwo7J0zDEn+BDO8PHnCbx2zjb8EUi7bk5B0bV2lPY=; b=Yo1YOVYsbgK7ubWo6M19WtPl1ESvwT9wFra5CJew/pvjtvz7Vis77Ogabob6G1JanepNIr sTprb3gcXjP2kBnZgLoZWFd77HUyWv8UfQ8oY7lCF/4fnLvQz8CJz20HsbNGrLA3/e8EYj 1u1I1nWIP7UR8CudqDPdd6krRHhBpNK/gAxO/40MyZ34e2QPXx4Web4J2Gio15oiHdFyTe E76wYkU+pdggF0BL2pwUr3yVOlk5+4sodw5oyVuYOVYjTV485SfU0mxBYLtrR4EouXrL1V zczqbJzZfPqNJNtHpwCqgOca6WLWZ/d/luHN69r+uGd4tlHCZtMjjBpTSKLtZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717427557; a=rsa-sha256; cv=none; b=hlNqOee8bariCPAdd/1i+rfUUOwaSfoAUVRjHcCKkNARS2SpZRx3mAaMWXcp/YAiG7iIrk GpMfCr+1xYUv61YeqU9MHsDB1AADDhQirRTG3L95rSqKTTmnBZpgMnLI+aGcmz9Tt9vf+2 rvavNLM73IWdU/PLL+oXw3PZCGtyfconpLBZv+m9gbWfSmTJaH7KcLdt6HFg8f0Y0SkWNO HB53CFduK/t6h0bFpLJZZeDjLVxgSR3tzGvY3X2qIpp7I6bWEnaHYpvI5vXUlhpGOYVzGL pYBr5eGz0ddq2zFVtmiV2ghImGP3gv68IJW4lehuTxZPd/Wr21RtVUfzlF2NMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717427557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sVdwo7J0zDEn+BDO8PHnCbx2zjb8EUi7bk5B0bV2lPY=; b=yx8Quf3RK+L61DpQn3RPVtiV2UiM9BI8n02f7s2+OYQuvApLwo61z3LK2Li4jejef9g7E0 yMPEG9Gjh0nV7E/doEkhlVLNXItJ+xYPH8cVP+d5r+yOpTbFf6nNBgB8TRWFytJ7o5dPKV zDRWchvTy3Tq2m3tQrQRwO98toScH7GwerS3JjlQoq2f1y3euQYY4if9SS2OqutoyzFYDj lfZsUlVplb30YjDNK5MymL/QFNuOQ/5tbAYPN4NJc6avbpruDYhpVLlgrL5AkA6vDl2z7S MZ8eTLYfY7aKLehXhyhC142lNkvcW8g3Oqj0hKNXygbCFhAgNTcilhU//qcwPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VtHK073CBzgV6; Mon, 3 Jun 2024 15:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 453FCaV6042812; Mon, 3 Jun 2024 15:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 453FCacv042809; Mon, 3 Jun 2024 15:12:36 GMT (envelope-from git) Date: Mon, 3 Jun 2024 15:12:36 GMT Message-Id: <202406031512.453FCacv042809@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 6a40d2932f25 - main - math/py-cvxpy: fix build on powerpc64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a40d2932f2520c3701186f7465a039711360253 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a40d2932f2520c3701186f7465a039711360253 commit 6a40d2932f2520c3701186f7465a039711360253 Author: Piotr Kubaj AuthorDate: 2024-06-03 15:03:01 +0000 Commit: Piotr Kubaj CommitDate: 2024-06-03 15:12:01 +0000 math/py-cvxpy: fix build on powerpc64 cvxpy/cvxcore/src/../include/Eigen/src/Core/arch/AltiVec/MatrixProduct.h:70:11: error: unknown type name 'Packet2d' 70 | typedef Packet2d vectortype; | ^ cvxpy/cvxcore/src/../include/Eigen/src/Core/arch/AltiVec/MatrixProduct.h:72:23: error: use of undeclared identifier 'Packet2d' 72 | typedef PacketBlock rhstype; | ^ cvxpy/cvxcore/src/../include/Eigen/src/Core/arch/AltiVec/MatrixProduct.h:656:44: error: use of undeclared identifier 'Packet2d' 656 | struct dhs_pack | ^ cvxpy/cvxcore/src/../include/Eigen/src/Core/arch/AltiVec/MatrixProduct.h:723:44: error: use of undeclared identifier 'Packet2d' 723 | struct dhs_pack | ^ cvxpy/cvxcore/src/../include/Eigen/src/Core/arch/AltiVec/MatrixProduct.h:1250:14: error: unknown type name 'Packet2l' 1250 | const static Packet2l mask21 = { -1, 0 }; | ^ cvxpy/cvxcore/src/../include/Eigen/src/Core/arch/AltiVec/MatrixProduct.h:1267:21: error: unknown type name 'Packet2d' 1267 | EIGEN_ALWAYS_INLINE Packet2d bmask(const int remaining_rows) | ^ cvxpy/cvxcore/src/../include/Eigen/src/Core/arch/AltiVec/MatrixProduct.h:1267:36: error: use of undeclared identifier 'Packet2d' 1267 | EIGEN_ALWAYS_INLINE Packet2d bmask(const int remaining_rows) --- .../files/patch-cvxpy_cvxcore_include_Eigen_Core | 11 ++ ...e_include_Eigen_src_Core_arch_AltiVec_Complex.h | 18 ++++ ...ude_Eigen_src_Core_arch_AltiVec_MathFunctions.h | 47 +++++++++ ...nclude_Eigen_src_Core_arch_AltiVec_PacketMath.h | 117 +++++++++++++++++++++ 4 files changed, 193 insertions(+) diff --git a/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_Core b/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_Core new file mode 100644 index 000000000000..e3e6d1ed6d71 --- /dev/null +++ b/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_Core @@ -0,0 +1,11 @@ +--- cvxpy/cvxcore/include/Eigen/Core.orig 2021-08-18 20:41:58 UTC ++++ cvxpy/cvxcore/include/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/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_Complex.h b/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_Complex.h new file mode 100644 index 000000000000..9729b0b44ea7 --- /dev/null +++ b/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_Complex.h @@ -0,0 +1,18 @@ +--- cvxpy/cvxcore/include/Eigen/src/Core/arch/AltiVec/Complex.h.orig 2021-08-18 20:41:58 UTC ++++ cvxpy/cvxcore/include/Eigen/src/Core/arch/AltiVec/Complex.h +@@ -100,6 +100,7 @@ template<> struct packet_traits > + HasAbs2 = 0, + HasMin = 0, + HasMax = 0, ++ HasSqrt = 1, + #ifdef __VSX__ + HasBlend = 1, + #endif +@@ -320,6 +321,7 @@ template<> struct packet_traits > + HasAbs2 = 0, + HasMin = 0, + HasMax = 0, ++ HasSqrt = 1, + HasSetLinear = 0 + }; + }; diff --git a/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_MathFunctions.h b/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_MathFunctions.h new file mode 100644 index 000000000000..8d766277495a --- /dev/null +++ b/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_MathFunctions.h @@ -0,0 +1,47 @@ +--- cvxpy/cvxcore/include/Eigen/src/Core/arch/AltiVec/MathFunctions.h.orig 2021-08-18 20:41:58 UTC ++++ cvxpy/cvxcore/include/Eigen/src/Core/arch/AltiVec/MathFunctions.h +@@ -40,16 +40,14 @@ Packet4f pcos(const Packet4f& _x) + return pcos_float(_x); + } + ++#ifdef __VSX__ + #ifndef EIGEN_COMP_CLANG + template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED + Packet4f prsqrt(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(const Packet2d& x) + { +@@ -73,6 +71,26 @@ template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEF + Packet2d pexp(const Packet2d& _x) + { + return pexp_double(_x); ++} ++ ++template<> EIGEN_STRONG_INLINE Packet8bf psqrt (const Packet8bf& a){ ++ BF16_TO_F32_UNARY_OP_WRAPPER(psqrt, a); ++} ++ ++#ifndef EIGEN_COMP_CLANG ++template<> EIGEN_STRONG_INLINE Packet8bf prsqrt (const Packet8bf& a){ ++ BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt, a); ++} ++#endif ++#else ++template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS ++Packet4f psqrt(const Packet4f& x) ++{ ++ Packet4f a; ++ for (Index i = 0; i < packet_traits::size; i++) { ++ a[i] = numext::sqrt(x[i]); ++ } ++ return a; + } + #endif + diff --git a/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_PacketMath.h b/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_PacketMath.h new file mode 100644 index 000000000000..b1d23be2b5b7 --- /dev/null +++ b/math/py-cvxpy/files/patch-cvxpy_cvxcore_include_Eigen_src_Core_arch_AltiVec_PacketMath.h @@ -0,0 +1,117 @@ +--- cvxpy/cvxcore/include/Eigen/src/Core/arch/AltiVec/PacketMath.h.orig 2021-08-18 20:41:58 UTC ++++ cvxpy/cvxcore/include/Eigen/src/Core/arch/AltiVec/PacketMath.h +@@ -175,16 +175,19 @@ struct packet_traits : 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 : 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(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet4i pcmp_lt(const Packet4i& a, const Packet4i& b) { return reinterpret_cast(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet4i pcmp_eq(const Packet4i& a, const Packet4i& b) { return reinterpret_cast(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8s pcmp_le(const Packet8s& a, const Packet8s& b) { return reinterpret_cast(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet8s pcmp_lt(const Packet8s& a, const Packet8s& b) { return reinterpret_cast(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet8s pcmp_eq(const Packet8s& a, const Packet8s& b) { return reinterpret_cast(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8us pcmp_le(const Packet8us& a, const Packet8us& b) { return reinterpret_cast(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet8us pcmp_lt(const Packet8us& a, const Packet8us& b) { return reinterpret_cast(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet8us pcmp_eq(const Packet8us& a, const Packet8us& b) { return reinterpret_cast(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet16c pcmp_le(const Packet16c& a, const Packet16c& b) { return reinterpret_cast(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet16c pcmp_lt(const Packet16c& a, const Packet16c& b) { return reinterpret_cast(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet16c pcmp_eq(const Packet16c& a, const Packet16c& b) { return reinterpret_cast(vec_cmpeq(a,b)); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_le(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast(vec_cmple(a,b)); } ++#endif + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_lt(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast(vec_cmplt(a,b)); } + template<> EIGEN_STRONG_INLINE Packet16uc pcmp_eq(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast(vec_cmpeq(a,b)); } + +@@ -937,6 +951,7 @@ template<> EIGEN_STRONG_INLINE Packet4f pround EIGEN_STRONG_INLINE Packet4f pceil(const Packet4f& a) { return vec_ceil(a); } + template<> EIGEN_STRONG_INLINE Packet4f pfloor(const Packet4f& a) { return vec_floor(a); } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet4f print(const Packet4f& a) + { + Packet4f res; +@@ -947,6 +962,7 @@ template<> EIGEN_STRONG_INLINE Packet4f print EIGEN_STRONG_INLINE Packet ploadu_common(const __UNPACK_TYPE__(Packet)* from) + { +@@ -1341,12 +1357,6 @@ template<> EIGEN_STRONG_INLINE Packet8bf psub, a, b); + } + +-template<> EIGEN_STRONG_INLINE Packet8bf psqrt (const Packet8bf& a){ +- BF16_TO_F32_UNARY_OP_WRAPPER(vec_sqrt, a); +-} +-template<> EIGEN_STRONG_INLINE Packet8bf prsqrt (const Packet8bf& a){ +- BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt, a); +-} + template<> EIGEN_STRONG_INLINE Packet8bf pexp (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(pexp_float, a); + } +@@ -1390,9 +1400,11 @@ template<> EIGEN_STRONG_INLINE Packet8bf pceil EIGEN_STRONG_INLINE Packet8bf pround (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(pround, a); + } ++#ifdef __VSX__ + template<> EIGEN_STRONG_INLINE Packet8bf print (const Packet8bf& a){ + BF16_TO_F32_UNARY_OP_WRAPPER(print, 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);