Skip to content

Commit

Permalink
Bump OpenBLAS SHA1 to newer version, don't apply old patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@staticfloat
staticfloat committed Mar 8, 2017
1 parent 1d678da commit 02d13db
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 8 additions & 1 deletion deps/blas.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-freebsd.patch-applied: $(BUILDDIR)/$(OP
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
$(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 > $@

Expand All @@ -97,7 +97,14 @@ $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-cross-compile.patch-applied: $(BUILDDIR
cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/openblas-cross-compile.patch
echo 1 > $@

# If building the git version of OpenBLAS, don't include the above patches
ifneq ($(DEPS_GIT), 1)

This comment has been minimized.

Sign in to view

Copy link
@tkelman

tkelman Mar 9, 2017

Contributor

deps_git doesn't change what version is used, only whether it's cloned or downloaded as a tarball

This comment has been minimized.

Sign in to view

Copy link
@staticfloat

staticfloat Mar 9, 2017

Author Member

I see. How do we pull branches instead of gitsha's? Or do we not do that anymore? If we don't do that anymore, what's the purpose of the *_BRANCH makevars defined in the *.version files?

This comment has been minimized.

Sign in to view

Copy link
@tkelman

tkelman Mar 9, 2017 •
edited
Loading

Contributor

they're mostly vestigial, I think you might need the commit to be visible in the history of the named branch? the branch may also determine a directory name, I forget exactly where they're still used - maybe we should get rid of them entirely
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-cross-compile.patch-applied
else
$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/source-extracted
endif

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

Expand Down
2 changes: 1 addition & 1 deletion 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_SHA1=4227049c7dc9b3e18823671e232c704350d7e579

0 comments on commit 02d13db

Please sign in to comment.