From bbde15b8bc4958084fdac6f323a42f9f986ba3e8 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Wed, 2 Jun 2021 12:51:57 +0200 Subject: [PATCH] revert the openblas change --- OpenBLAS-fix-dynamic-arch.patch | 17 +++++++++++++---- OpenBLAS.spec | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/OpenBLAS-fix-dynamic-arch.patch b/OpenBLAS-fix-dynamic-arch.patch index cf1baa9af24..8ba0d33d78f 100644 --- a/OpenBLAS-fix-dynamic-arch.patch +++ b/OpenBLAS-fix-dynamic-arch.patch @@ -1,13 +1,22 @@ diff --git a/Makefile.x86_64 b/Makefile.x86_64 -index f62ab9e..f23a65b 100644 +index f2de51e..e1c348a 100644 --- a/Makefile.x86_64 +++ b/Makefile.x86_64 @@ -9,7 +9,7 @@ endif endif + ifeq ($(CORE), SKYLAKEX) +-ifndef DYNAMIC_ARCH ++ifneq ($(DYNAMIC_ARCH), 1) + ifndef NO_AVX512 + CCOMMON_OPT += -march=skylake-avx512 + FCOMMON_OPT += -march=skylake-avx512 +@@ -28,7 +28,7 @@ endif + endif + ifeq ($(CORE), HASWELL) -ifndef DYNAMIC_ARCH +ifneq ($(DYNAMIC_ARCH), 1) - ADD_CPUFLAGS = 1 - else - ifdef TARGET_CORE + ifndef NO_AVX2 + ifeq ($(C_COMPILER), GCC) + CCOMMON_OPT += -mavx2 diff --git a/OpenBLAS.spec b/OpenBLAS.spec index b20dbbded15..6f1addf0ef2 100644 --- a/OpenBLAS.spec +++ b/OpenBLAS.spec @@ -1,4 +1,4 @@ -### RPM external OpenBLAS 0.3.15 +### RPM external OpenBLAS 0.3.9 ## INCLUDE compilation_flags Source: https://github.com/xianyi/OpenBLAS/archive/v%{realversion}.tar.gz Patch0: OpenBLAS-fix-dynamic-arch