Use OpenBLAS 0.3.13

Bumping to support xcode/clang 12 which was addressed in OpenBLAS 0.3.11
JuliaLang · Jan 12, 2021 · 33d04d3 · 33d04d3
1 parent 6c1824d
commit 33d04d3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 37 deletions.
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -75,7 +75,7 @@ OBJCONV_JLL_NAME := Objconv
 OBJCONV_JLL_VER  := 2.49.1+0
 
 # OpenBLAS
-OPENBLAS_VER := 0.3.10
+OPENBLAS_VER := 0.3.13
 OPENBLAS_JLL_NAME := OpenBLAS
 
 # OpenLibm

diff --git a/deps/openblas.version b/deps/openblas.version
@@ -1,2 +1,2 @@
-OPENBLAS_BRANCH=v0.3.10
-OPENBLAS_SHA1=63b03efc2af332c88b86d4fd8079d00f4b439adf
+OPENBLAS_BRANCH=v0.3.13
+OPENBLAS_SHA1=d2b11c47774b9216660e76e2fc67e87079f26fa1
diff --git a/deps/patches/openblas-ofast-power.patch b/deps/patches/openblas-ofast-power.patch
@@ -1,33 +1,32 @@
- Makefile.power | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ Makefile.power | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.power b/Makefile.power
-index 24d8aa8a..e53a243a 100644
+index c7e97229..8426e816 100644
 --- a/Makefile.power
 +++ b/Makefile.power
-@@ -11,20 +11,20 @@ endif
-
- ifeq ($(CORE), POWER9)
- ifeq ($(USE_OPENMP), 1)
--COMMON_OPT += -Ofast -mcpu=power9 -mtune=power9 -mvsx -malign-power -DUSE_OPENMP -fno-fast-math -fopenmp
-+COMMON_OPT += -mcpu=power9 -mtune=power9 -mvsx -malign-power -DUSE_OPENMP -fno-fast-math -fopenmp
- FCOMMON_OPT += -O2 -frecursive -mcpu=power9 -mtune=power9 -malign-power -DUSE_OPENMP -fno-fast-math -fopenmp
- else
--COMMON_OPT += -Ofast -mcpu=power9 -mtune=power9 -mvsx -malign-power -fno-fast-math
-+COMMON_OPT += -mcpu=power9 -mtune=power9 -mvsx -malign-power -fno-fast-math
- FCOMMON_OPT += -O2 -frecursive -mcpu=power9 -mtune=power9 -malign-power -fno-fast-math
+@@ -10,13 +10,13 @@ USE_OPENMP = 1
  endif
+
+ ifeq ($(CORE), POWER10)
+-CCOMMON_OPT += -Ofast -mcpu=power10 -mtune=power10 -mvsx -fno-fast-math
++CCOMMON_OPT += -mcpu=power10 -mtune=power10 -mvsx -fno-fast-math
+ FCOMMON_OPT += -O2 -frecursive -mcpu=power10 -mtune=power10  -fno-fast-math
  endif
 
+ ifeq ($(CORE), POWER9)
+ ifneq ($(C_COMPILER), PGI)
+-CCOMMON_OPT += -Ofast -mvsx -fno-fast-math
++CCOMMON_OPT += -mvsx -fno-fast-math
+ ifeq ($(C_COMPILER), GCC)
+ ifneq ($(GCCVERSIONGT4), 1)
+ $(warning your compiler is too old to fully support POWER9, getting a newer version of gcc is recommended)
+@@ -49,7 +49,7 @@ endif
+
  ifeq ($(CORE), POWER8)
- ifeq ($(USE_OPENMP), 1)
--COMMON_OPT += -Ofast -mcpu=power8 -mtune=power8 -mvsx -malign-power -DUSE_OPENMP -fno-fast-math -fopenmp
-+COMMON_OPT += -mcpu=power8 -mtune=power8 -mvsx -malign-power -DUSE_OPENMP -fno-fast-math -fopenmp
- FCOMMON_OPT += -O2 -frecursive -mcpu=power8 -mtune=power8 -malign-power -DUSE_OPENMP -fno-fast-math -fopenmp
+ ifneq ($(C_COMPILER), PGI)
+-CCOMMON_OPT += -Ofast -mcpu=power8 -mtune=power8 -mvsx  -fno-fast-math
++CCOMMON_OPT += -mcpu=power8 -mtune=power8 -mvsx  -fno-fast-math
  else
--COMMON_OPT += -Ofast -mcpu=power8 -mtune=power8 -mvsx -malign-power -fno-fast-math
-+COMMON_OPT += -mcpu=power8 -mtune=power8 -mvsx -malign-power -fno-fast-math
- FCOMMON_OPT += -O2 -frecursive -mcpu=power8 -mtune=power8 -malign-power -fno-fast-math
+ CCOMMON_OPT += -fast -Mvect=simd -Mcache_align
  endif
- endif
-
diff --git a/deps/patches/openblas-winexit.patch b/deps/patches/openblas-winexit.patch
@@ -3,14 +3,14 @@ From: Keno Fischer <[email protected]>
 Date: Sat, 14 Mar 2020 12:05:19 +0100
 
 ---
- driver/others/memory.c | 131 +----------------------------------------
+ driver/others/memory.c | 131 +------------------------------------------------
  1 file changed, 2 insertions(+), 129 deletions(-)
 
 diff --git a/driver/others/memory.c b/driver/others/memory.c
-index 62a5a021..23f8fe65 100644
+index ba2bb55b..bf6b5529 100644
 --- a/driver/others/memory.c
 +++ b/driver/others/memory.c
-@@ -1510,7 +1510,7 @@ void CONSTRUCTOR gotoblas_init(void) {
+@@ -1534,7 +1534,7 @@ void CONSTRUCTOR gotoblas_init(void) {
 
  }
 
@@ -19,7 +19,7 @@ index 62a5a021..23f8fe65 100644
 
    if (gotoblas_initialized == 0) return;
 
-@@ -1547,74 +1547,12 @@ void DESTRUCTOR gotoblas_quit(void) {
+@@ -1571,74 +1571,12 @@ void DESTRUCTOR gotoblas_quit(void) {
  #endif
  }
 
@@ -57,8 +57,8 @@ index 62a5a021..23f8fe65 100644
 -*/
 -static int on_process_term(void)
 -{
--	gotoblas_quit();
--	return 0;
+-  gotoblas_quit();
+-  return 0;
 -}
  #ifdef _WIN64
  #pragma comment(linker, "/INCLUDE:_tls_used")
@@ -94,7 +94,7 @@ index 62a5a021..23f8fe65 100644
  #if (defined(C_PGI) || (!defined(C_SUN) && defined(F_INTERFACE_SUN))) && (defined(ARCH_X86) || defined(ARCH_X86_64))
  /* Don't call me; this is just work around for PGI / Sun bug */
  void gotoblas_dummy_for_PGI(void) {
-@@ -3104,7 +3042,7 @@ void CONSTRUCTOR gotoblas_init(void) {
+@@ -3136,7 +3074,7 @@ void CONSTRUCTOR gotoblas_init(void) {
 
  }
 
@@ -103,7 +103,7 @@ index 62a5a021..23f8fe65 100644
 
    if (gotoblas_initialized == 0) return;
 
-@@ -3133,71 +3071,6 @@ void DESTRUCTOR gotoblas_quit(void) {
+@@ -3165,71 +3103,6 @@ void DESTRUCTOR gotoblas_quit(void) {
  #endif
  }
 
@@ -138,8 +138,8 @@ index 62a5a021..23f8fe65 100644
 -*/
 -static int on_process_term(void)
 -{
--	gotoblas_quit();
--	return 0;
+-  gotoblas_quit();
+-  return 0;
 -}
 -#ifdef _WIN64
 -#pragma comment(linker, "/INCLUDE:_tls_used")
@@ -175,4 +175,3 @@ index 62a5a021..23f8fe65 100644
  #if (defined(C_PGI) || (!defined(C_SUN) && defined(F_INTERFACE_SUN))) && (defined(ARCH_X86) || defined(ARCH_X86_64))
  /* Don't call me; this is just work around for PGI / Sun bug */
  void gotoblas_dummy_for_PGI(void) {
-