From 5242355a2d8c984a9058ed34cb38bdfbcd441ba1 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 11 Sep 2021 21:10:35 -0400 Subject: [PATCH] Apply MMA patch unconditionally, and edit patch to only define MMA disable on __PPC64__ (rhbz#2003362) --- eigen3.spec | 8 +++++--- eigen_mma.patch | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eigen3.spec b/eigen3.spec index 0f1da8c..966b378 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -21,7 +21,7 @@ Name: eigen3 Version: 3.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight C++ template library for vector and matrix math License: MPLv2.0 and LGPLv2+ and BSD and Minpack @@ -77,9 +77,7 @@ Developer documentation for Eigen. %prep %setup -q -n eigen-%{version} -%ifarch ppc64le %patch0 -p1 -%endif %build @@ -120,6 +118,10 @@ rm -f %{_vpath_builddir}/doc/html/unsupported/installdox %changelog +* Sun Sep 12 2021 Rich Mattes - 3.4.0-3 +- Apply MMA patch unconditionally, and edit patch to only define MMA disable on + __PPC64__ (rhbz#2003362) + * Wed Aug 25 2021 Sandro Mani - 3.4.0-2 - Temporarily disable EIGEN_ALTIVEC_DISABLE_MMA on PPC64le diff --git a/eigen_mma.patch b/eigen_mma.patch index 9b1932d..b64249a 100644 --- a/eigen_mma.patch +++ b/eigen_mma.patch @@ -1,14 +1,14 @@ diff -rupN eigen-3.4.0/Eigen/src/Core/arch/AltiVec/MatrixProduct.h eigen-3.4.0-new/Eigen/src/Core/arch/AltiVec/MatrixProduct.h --- eigen-3.4.0/Eigen/src/Core/arch/AltiVec/MatrixProduct.h 2021-08-18 22:41:58.000000000 +0200 +++ eigen-3.4.0-new/Eigen/src/Core/arch/AltiVec/MatrixProduct.h 2021-08-22 17:37:23.626427133 +0200 -@@ -28,6 +28,9 @@ +@@ -28,6 +28,10 @@ #endif #endif ++#ifdef __PPC64__ +#define EIGEN_ALTIVEC_DISABLE_MMA -+ ++#endif + #ifdef __has_builtin #if __has_builtin(__builtin_mma_assemble_acc) #define ALTIVEC_MMA_SUPPORT -diff -rupN eigen-3.4.0/Eigen/src/Core/util/Macros.h eigen-3.4.0-new/Eigen/src/Core/util/Macros.h