Skip to content

Commit

Permalink
Upgrade OpenBLAS to v0.3.17 (#41973)
Browse files Browse the repository at this point in the history
* Upgrade OpenBLAS to v0.3.17

This allows us to drop several patches.

* Precision adjustments in doctests
  • Loading branch information
ararslan authored Aug 24, 2021
1 parent e7995e4 commit b8ad4f1
Show file tree
Hide file tree
Showing 14 changed files with 152 additions and 710 deletions.
2 changes: 1 addition & 1 deletion deps/Versions.make
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ BLASTRAMPOLINE_VER := 3.0.4
BLASTRAMPOLINE_JLL_NAME := libblastrampoline

# OpenBLAS
OPENBLAS_VER := 0.3.13
OPENBLAS_VER := 0.3.17
OPENBLAS_JLL_NAME := OpenBLAS

# OpenLibm
Expand Down
186 changes: 94 additions & 92 deletions deps/checksums/openblas

Large diffs are not rendered by default.

19 changes: 2 additions & 17 deletions deps/openblas.mk
Original file line number Diff line number Diff line change
Expand Up @@ -103,27 +103,12 @@ $(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-exshift.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-ofast-power.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/openblas-exshift.patch
echo 1 > $@

$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-filter-out-mavx-flag-on-zgemm-kernels.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-exshift.patch-applied
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && \
patch -p1 -f < $(SRCDIR)/patches/openblas-filter-out-mavx-flag-on-zgemm-kernels.patch
echo 1 > $@

$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-Only-filter-out-mavx-on-Sandybridge.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-filter-out-mavx-flag-on-zgemm-kernels.patch-applied
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && \
patch -p1 -f < $(SRCDIR)/patches/openblas-Only-filter-out-mavx-on-Sandybridge.patch
echo 1 > $@

$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-armv8-volatile-detecion.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-Only-filter-out-mavx-on-Sandybridge.patch-applied
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && \
patch -p1 -f < $(SRCDIR)/patches/openblas-armv8-volatile-detecion.patch
echo 1 > $@

$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-armv8-volatile-detecion.patch-applied
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/neoverse-generic-kernels.patch-applied
echo 1 > $@

$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured
Expand Down
4 changes: 2 additions & 2 deletions deps/openblas.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
OPENBLAS_BRANCH=v0.3.13
OPENBLAS_SHA1=d2b11c47774b9216660e76e2fc67e87079f26fa1
OPENBLAS_BRANCH=v0.3.17
OPENBLAS_SHA1=d909f9f3d4fc4ccff36d69f178558df154ba1002
19 changes: 19 additions & 0 deletions deps/patches/neoverse-generic-kernels.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/kernel/arm64/KERNEL.NEOVERSEN1 b/kernel/arm64/KERNEL.NEOVERSEN1
index ea010db4..074d7215 100644
--- a/kernel/arm64/KERNEL.NEOVERSEN1
+++ b/kernel/arm64/KERNEL.NEOVERSEN1
@@ -91,10 +91,10 @@ IDAMAXKERNEL = iamax_thunderx2t99.c
ICAMAXKERNEL = izamax_thunderx2t99.c
IZAMAXKERNEL = izamax_thunderx2t99.c

-SNRM2KERNEL = scnrm2_thunderx2t99.c
-DNRM2KERNEL = dznrm2_thunderx2t99.c
-CNRM2KERNEL = scnrm2_thunderx2t99.c
-ZNRM2KERNEL = dznrm2_thunderx2t99.c
+SNRM2KERNEL = nrm2.S
+DNRM2KERNEL = nrm2.S
+CNRM2KERNEL = znrm2.S
+ZNRM2KERNEL = znrm2.S

DDOTKERNEL = dot_thunderx2t99.c
SDOTKERNEL = dot_thunderx2t99.c
221 changes: 0 additions & 221 deletions deps/patches/openblas-Only-filter-out-mavx-on-Sandybridge.patch

This file was deleted.

23 changes: 0 additions & 23 deletions deps/patches/openblas-armv8-volatile-detecion.patch

This file was deleted.

Loading

0 comments on commit b8ad4f1

Please sign in to comment.