diff --git a/.gitignore b/.gitignore index 1fabb10..83cd3f9 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /openblas-0.3.6.tar.gz /openblas-0.3.7.tar.gz /openblas-0.3.8.tar.gz +/openblas-0.3.9.tar.gz diff --git a/openblas-0.3.8-noz15.patch b/openblas-0.3.8-noz15.patch deleted file mode 100644 index fbb6bd5..0000000 --- a/openblas-0.3.8-noz15.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5a6bba3061f19923eb9972378021e6498bf8e5ed Mon Sep 17 00:00:00 2001 -From: Susi Lehtola -Date: Tue, 11 Feb 2020 15:07:33 +1300 -Subject: [PATCH] Patch out instances of Z15 in dynamic_zarch.c - -There does not appear to be a Z15 kernel yet, causing link errors from the code. This patch fixes the issue. ---- - driver/others/dynamic_zarch.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/driver/others/dynamic_zarch.c b/driver/others/dynamic_zarch.c -index 1206bf870..c7b82e4df 100644 ---- a/driver/others/dynamic_zarch.c -+++ b/driver/others/dynamic_zarch.c -@@ -3,12 +3,12 @@ - - extern gotoblas_t gotoblas_Z13; - extern gotoblas_t gotoblas_Z14; --extern gotoblas_t gotoblas_Z15; -+//extern gotoblas_t gotoblas_Z15; - //#if (!defined C_GCC) || (GCC_VERSION >= 60000) - //extern gotoblas_t gotoblas_Z14; - //#endif - --#define NUM_CORETYPES 5 -+#define NUM_CORETYPES 4 - - extern void openblas_warning(int verbose, const char* msg); - -@@ -16,14 +16,14 @@ static char* corename[] = { - "unknown", - "Z13", - "Z14", -- "Z15", -+// "Z15", - "ZARCH_GENERIC", - }; - - char* gotoblas_corename(void) { - if (gotoblas == &gotoblas_Z13) return corename[1]; - if (gotoblas == &gotoblas_Z14) return corename[2]; -- if (gotoblas == &gotoblas_Z15) return corename[3]; -+// if (gotoblas == &gotoblas_Z15) return corename[3]; - //#if (!defined C_GCC) || (GCC_VERSION >= 60000) - // if (gotoblas == &gotoblas_POWER9) return corename[3]; - //#endif -@@ -78,7 +78,7 @@ static gotoblas_t* force_coretype(char* coretype) { - { - case 1: return (&gotoblas_Z13); - case 2: return (&gotoblas_Z14); -- case 3: return (&gotoblas_Z15); -+// case 3: return (&gotoblas_Z15); - //#if (!defined C_GCC) || (GCC_VERSION >= 60000) - // case 3: return (&gotoblas_POWER9); - //#endif diff --git a/openblas-0.3.8-zarch.patch b/openblas-0.3.8-zarch.patch deleted file mode 100644 index 002cbf9..0000000 --- a/openblas-0.3.8-zarch.patch +++ /dev/null @@ -1,22 +0,0 @@ -From dff173e50e01d94e0741e4b4eaa1cf0aa01cf320 Mon Sep 17 00:00:00 2001 -From: Susi Lehtola -Date: Tue, 11 Feb 2020 14:46:30 +1300 -Subject: [PATCH] Fix typo in dynamic_zarch.c - ---- - driver/others/dynamic_zarch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/driver/others/dynamic_zarch.c b/driver/others/dynamic_zarch.c -index 1206bf870..896e65bb4 100644 ---- a/driver/others/dynamic_zarch.c -+++ b/driver/others/dynamic_zarch.c -@@ -31,7 +31,7 @@ char* gotoblas_corename(void) { - } - - // __builtin_cpu_is is not supported by zarch --static gotolabs_t* get_coretype(void) { -+static gotoblas_t* get_coretype(void) { - FILE* infile; - char buffer[512], * p; - diff --git a/openblas.spec b/openblas.spec index 6e4b99e..8c78853 100644 --- a/openblas.spec +++ b/openblas.spec @@ -14,7 +14,7 @@ # "obsoleted" features are still kept in the spec. Name: openblas -Version: 0.3.8 +Version: 0.3.9 Release: 1%{?dist} Summary: An optimized BLAS library based on GotoBLAS2 License: BSD @@ -29,11 +29,6 @@ Patch2: openblas-0.2.15-constructor.patch # Supply the proper flags to the test makefile Patch3: openblas-0.3.7-tests.patch -# https://patch-diff.githubusercontent.com/raw/xianyi/OpenBLAS/pull/2405.patch -Patch4: openblas-0.3.8-zarch.patch -# https://github.com/xianyi/OpenBLAS/pull/2407 -Patch5: openblas-0.3.8-noz15.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gcc-gfortran @@ -246,8 +241,6 @@ cd OpenBLAS-%{version} %patch2 -p1 -b .constructor %endif %patch3 -p1 -b .tests -%patch4 -p1 -b .zarch -%patch5 -p1 -b .noz15 # Fix source permissions find -name \*.f -exec chmod 644 {} \; @@ -671,6 +664,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig %endif %changelog +* Mon Mar 02 2020 Susi Lehtola - 0.3.9-1 +- Update to 0.3.9. + * Tue Feb 11 2020 Susi Lehtola - 0.3.8-1 - Update to 0.3.8; dynamic runtime cpu detection on all architectures. - Also updates bundled LAPACK to 3.9.0. diff --git a/sources b/sources index 1fd6105..3587dc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openblas-0.3.8.tar.gz) = d557a332b1f905399d97dd5392ca10ca4eed47d669cae4abea374ed7c2e6c1ab29a4415df1224e940b9041e1545fa5ede2bdfb266986230436014795e7d3289d +SHA512 (openblas-0.3.9.tar.gz) = e34da25b3aaf959ec12826ac68c81e739e453d44f2dba28b15e57d7a827edc4d5f42988e9b6d98ac07999940be7b5876246cb3a980e590ae87f77f4c2f12f40a