From 1a1186f8d10c471089c649cccfb9133d576c5a76 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Tue, 20 Apr 2021 15:24:33 +0200 Subject: [PATCH] Disable the custom vvrsum function introduced in the ibm patches. Related: 1951565 --- 0006-Add-IBM-z14-support.patch | 12 ++++++------ atlas.spec | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/0006-Add-IBM-z14-support.patch b/0006-Add-IBM-z14-support.patch index b00761b..d1e99bc 100644 --- a/0006-Add-IBM-z14-support.patch +++ b/0006-Add-IBM-z14-support.patch @@ -237,12 +237,12 @@ index f171933..eb75577 100644 + #if ATL_VLEN != 4 + #error "VSXZ2 supports only VLEN = 4 for floats!" + #endif -+ #define ATL_vvrsum4(s0_, s1_, s2_, s3_) \ -+ { ATL_VTYPE t0_, t1_; \ -+ t0_ = vec_mergeh(s0_, s1_) + vec_mergel(s0_, s1_); \ -+ t1_ = vec_mergeh(s2_, s3_) + vec_mergel(s2_, s3_); \ -+ s0_ = ATL_VPERMI(t0_, t1_, 0) + ATL_VPERMI(t0_, t1_, 3); \ -+ } ++ //#define ATL_vvrsum4(s0_, s1_, s2_, s3_) \ ++ //{ ATL_VTYPE t0_, t1_; \ ++ // t0_ = vec_mergeh(s0_, s1_) + vec_mergel(s0_, s1_); \ ++ // t1_ = vec_mergeh(s2_, s3_) + vec_mergel(s2_, s3_); \ ++ // s0_ = ATL_VPERMI(t0_, t1_, 0) + ATL_VPERMI(t0_, t1_, 3); \ ++ //} + #define ATL_vsplat2(d_, s_) d_ = vec_splat(s_, 2) + #define ATL_vsplat3(d_, s_) d_ = vec_splat(s_, 3) + #else /* double precision */ diff --git a/atlas.spec b/atlas.spec index ce69e49..86e6370 100644 --- a/atlas.spec +++ b/atlas.spec @@ -5,7 +5,7 @@ Version: 3.10.3 %if "%{?enable_native_atlas}" != "0" %define dist .native %endif -Release: 16%{?dist} +Release: 17%{?dist} Summary: Automatically Tuned Linear Algebra Software License: BSD @@ -766,6 +766,10 @@ fi %endif %changelog +* Tue Apr 20 2021 Jakub Martisko - 3.10.3-17 +- Disable the custom vvrsum function introduced in the ibm patch +Related: 1951565 + * Tue Apr 20 2021 Jakub Martisko - 3.10.3-16 - Move the cblas.h and clapack.h to include/atlas to resolve conflict with lapack - Resolves: #1948187