Skip to content

Commit

Permalink
Upgrade openblas to 0.2.20 (#22975)
Browse files Browse the repository at this point in the history 
remove patches that are included in this version

Ref #22975
(cherry picked from commit 154e503)
  • Loading branch information
@tkelman @ararslan
tkelman authored and ararslan committed Apr 26, 2018
1 parent 0948d58 commit e28fa23
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 8,742 deletions.
25 changes: 1 addition & 24 deletions deps/blas.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,30 +80,7 @@ endif
# Do not overwrite the "-j" flag
OPENBLAS_BUILD_OPTS += MAKE_NB_JOBS=0

# Patch submitted upstream: https://github.com/xianyi/OpenBLAS/pull/1015
# Remove the patch here once we're using a version of OpenBLAS that includes the upstream patch
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-freebsd.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/source-extracted
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && patch -p0 -f < $(SRCDIR)/patches/openblas-freebsd.patch
echo 1 > $@

# Clang assembler bug workaround from https://github.com/xianyi/OpenBLAS/pull/982
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-clangasmbug.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-freebsd.patch-applied
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/openblas-clangasmbug.patch
echo 1 > $@

# Cross compiler autodetection workaround from https://github.com/xianyi/OpenBLAS/pull/968
# Remove this when we upgrade beyond OpenBLAS v0.2.19
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-cross-compile.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-clangasmbug.patch-applied
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/openblas-cross-compile.patch
echo 1 > $@

# Power inline assembly fixes from https://github.com/xianyi/OpenBLAS/pull/1098
# Remove this when we upgrade beyond OpenBLAS v0.2.19
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-power-assembly-fixes.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-cross-compile.patch-applied
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/openblas-power-assembly-fixes.patch
echo 1 > $@

$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-power-assembly-fixes.patch-applied
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/source-extracted
perl -i -ple 's/^\s*(EXTRALIB\s*\+=\s*-lSystemStubs)\s*$$/# $$1/g' $(dir $<)/Makefile.system
echo 1 > $@

Expand Down
1 change: 1 addition & 0 deletions deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
27988d4f3e64a187bc640c224f3ca347
1 change: 1 addition & 0 deletions deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
03a953bebc99e323d44f6d2c9865ae5817fe99dba24752e33eef7ebea5a4354e6e06aee9cf16c3b16788f091fb3e75dba9d8e9002167d6e08be3a4af95a90ea2
1 change: 0 additions & 1 deletion deps/checksums/openblas-85636ff1a015d04d3a8f960bc644b85ee5157135.tar.gz/md5
View file

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/openblas-85636ff1a015d04d3a8f960bc644b85ee5157135.tar.gz/sha512
View file

This file was deleted.

4 changes: 2 additions & 2 deletions deps/openblas.version
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
OPENBLAS_BRANCH=v0.2.19
OPENBLAS_SHA1=85636ff1a015d04d3a8f960bc644b85ee5157135
OPENBLAS_BRANCH=v0.2.20
OPENBLAS_SHA1=5dde4e65d321076582a2fafe16949d2160551e81

0 comments on commit e28fa23

Please sign in to comment.