[OpenBLAS_jll] Update to v0.3.20 (JuliaLang#44321)

LilithHafner · Mar 8, 2022 · 2672cc6 · 2672cc6
1 parent 1c6d49d
commit 2672cc6
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 207 deletions.
diff --git a/deps/checksums/openblas b/deps/checksums/openblas
diff --git a/deps/openblas.mk b/deps/openblas.mk
@@ -90,12 +90,7 @@ $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-ofast-power.patch-applied: $(BUILDDIR)/
 		patch -p1 -f < $(SRCDIR)/patches/openblas-ofast-power.patch
 	echo 1 > $@
 
-$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-julia42415-lapack625-openblas3392.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-ofast-power.patch-applied
-	cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && \
-		patch -p1 -f < $(SRCDIR)/patches/openblas-julia42415-lapack625-openblas3392.patch
-	echo 1 > $@
-
-$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/neoverse-generic-kernels.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-julia42415-lapack625-openblas3392.patch-applied
+$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/neoverse-generic-kernels.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-ofast-power.patch-applied
 	cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && \
 		patch -p1 -f < $(SRCDIR)/patches/neoverse-generic-kernels.patch
 	echo 1 > $@

diff --git a/deps/openblas.version b/deps/openblas.version
@@ -1,2 +1,2 @@
-OPENBLAS_BRANCH=v0.3.17
-OPENBLAS_SHA1=d909f9f3d4fc4ccff36d69f178558df154ba1002
+OPENBLAS_BRANCH=v0.3.20
+OPENBLAS_SHA1=0b678b19dc03f2a999d6e038814c4c50b9640a4e
diff --git a/deps/patches/openblas-julia42415-lapack625-openblas3392.patch b/deps/patches/openblas-julia42415-lapack625-openblas3392.patch
diff --git a/deps/patches/openblas-ofast-power.patch b/deps/patches/openblas-ofast-power.patch
@@ -1,26 +1,27 @@
 diff --git a/Makefile.power b/Makefile.power
-index 946f5523..19593050 100644
+index 28a0bae0..b4869fbd 100644
 --- a/Makefile.power
 +++ b/Makefile.power
-@@ -11,14 +11,14 @@ endif
-
+@@ -11,7 +11,7 @@ endif
+ 
  ifeq ($(CORE), POWER10)
  ifneq ($(C_COMPILER), PGI)
 -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
- endif
-
+ ifeq ($(F_COMPILER), IBM)
+ FCOMMON_OPT += -O2 -qrecur -qnosave
+ else
+@@ -22,7 +22,7 @@ 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)
-@@ -51,7 +51,7 @@ endif
-
+@@ -59,7 +59,7 @@ endif
+ 
  ifeq ($(CORE), POWER8)
  ifneq ($(C_COMPILER), PGI)
 -CCOMMON_OPT += -Ofast -mcpu=power8 -mtune=power8 -mvsx  -fno-fast-math

diff --git a/stdlib/OpenBLAS_jll/Project.toml b/stdlib/OpenBLAS_jll/Project.toml
@@ -1,6 +1,6 @@
 name = "OpenBLAS_jll"
 uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
-version = "0.3.17+2"
+version = "0.3.20+0"
 
 [deps]
 CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"