From 8ddb567daab3ef6e658d3ef9aa0d6fa4cb385204 Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Wed, 23 May 2018 11:38:29 -0400
Subject: [PATCH] upgrade OpenBLAS to 0.3.0

---
 deps/blas.mk                                  |  8 +--
 .../md5                                       |  1 -
 .../sha512                                    |  1 -
 .../md5                                       |  1 +
 .../sha512                                    |  1 +
 deps/openblas.version                         |  4 +-
 deps/patches/openblas-musl-PR1257.patch       | 65 -------------------
 7 files changed, 5 insertions(+), 76 deletions(-)
 delete mode 100644 deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/md5
 delete mode 100644 deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/sha512
 create mode 100644 deps/checksums/openblas-939452ea9dcb57abdcc3f1278c6db668a4690465.tar.gz/md5
 create mode 100644 deps/checksums/openblas-939452ea9dcb57abdcc3f1278c6db668a4690465.tar.gz/sha512
 delete mode 100644 deps/patches/openblas-musl-PR1257.patch

diff --git a/deps/blas.mk b/deps/blas.mk
index dcdf92bd4f765..dab61118d0678 100644
--- a/deps/blas.mk
+++ b/deps/blas.mk
@@ -80,13 +80,7 @@ endif
 # Do not overwrite the "-j" flag
 OPENBLAS_BUILD_OPTS += MAKE_NB_JOBS=0
 
-# Fix build on musl libc, from https://github.com/xianyi/OpenBLAS/pull/1257
-# remove when upgrading past openblas v0.2.20
-$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-musl-PR1257.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/source-extracted
-	cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && patch -p1 -f < $(SRCDIR)/patches/openblas-musl-PR1257.patch
-	echo 1 > $@
-
-$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-musl-PR1257.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 > $@
 
diff --git a/deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/md5 b/deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/md5
deleted file mode 100644
index cab4053456483..0000000000000
--- a/deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/md5
+++ /dev/null
@@ -1 +0,0 @@
-27988d4f3e64a187bc640c224f3ca347
diff --git a/deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/sha512 b/deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/sha512
deleted file mode 100644
index 1245e8322a4b8..0000000000000
--- a/deps/checksums/openblas-5dde4e65d321076582a2fafe16949d2160551e81.tar.gz/sha512
+++ /dev/null
@@ -1 +0,0 @@
-03a953bebc99e323d44f6d2c9865ae5817fe99dba24752e33eef7ebea5a4354e6e06aee9cf16c3b16788f091fb3e75dba9d8e9002167d6e08be3a4af95a90ea2
diff --git a/deps/checksums/openblas-939452ea9dcb57abdcc3f1278c6db668a4690465.tar.gz/md5 b/deps/checksums/openblas-939452ea9dcb57abdcc3f1278c6db668a4690465.tar.gz/md5
new file mode 100644
index 0000000000000..88f78d226d8de
--- /dev/null
+++ b/deps/checksums/openblas-939452ea9dcb57abdcc3f1278c6db668a4690465.tar.gz/md5
@@ -0,0 +1 @@
+48cd39d0cc38ebcbabb8c666c9725bdd
diff --git a/deps/checksums/openblas-939452ea9dcb57abdcc3f1278c6db668a4690465.tar.gz/sha512 b/deps/checksums/openblas-939452ea9dcb57abdcc3f1278c6db668a4690465.tar.gz/sha512
new file mode 100644
index 0000000000000..c51409e5bf3f6
--- /dev/null
+++ b/deps/checksums/openblas-939452ea9dcb57abdcc3f1278c6db668a4690465.tar.gz/sha512
@@ -0,0 +1 @@
+ac9fb76726685fde71c865d58d7171dbb46ae9c5518ab19066e3789fe2a0a5a253406d6a6eb54aa93432f68af2045cfc6fc2c73acafc961c7732e222cac71010
diff --git a/deps/openblas.version b/deps/openblas.version
index 4f1a8fead6ff5..aade1c2502424 100644
--- a/deps/openblas.version
+++ b/deps/openblas.version
@@ -1,2 +1,2 @@
-OPENBLAS_BRANCH=v0.2.20
-OPENBLAS_SHA1=5dde4e65d321076582a2fafe16949d2160551e81
+OPENBLAS_BRANCH=v0.3.0
+OPENBLAS_SHA1=939452ea9dcb57abdcc3f1278c6db668a4690465
diff --git a/deps/patches/openblas-musl-PR1257.patch b/deps/patches/openblas-musl-PR1257.patch
deleted file mode 100644
index 1516e30b9d8bc..0000000000000
--- a/deps/patches/openblas-musl-PR1257.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 63cfa32691680505e6b9daf0997755178ddd3144 Mon Sep 17 00:00:00 2001
-From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
-Date: Mon, 31 Jul 2017 21:02:43 +0200
-Subject: [PATCH] Rework __GLIBC_PREREQ checks to avoid breaking non-glibc
- builds
-
----
- driver/others/memory.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/driver/others/memory.c b/driver/others/memory.c
-index b5b58b6fd..661f7c4eb 100644
---- a/driver/others/memory.c
-+++ b/driver/others/memory.c
-@@ -155,7 +155,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #ifdef DYNAMIC_ARCH
- gotoblas_t *gotoblas = NULL;
- #endif
--
- extern void openblas_warning(int verbose, const char * msg);
- 
- #ifndef SMP
-@@ -187,25 +186,24 @@ int i,n;
-      
- #if !defined(__GLIBC_PREREQ)
-    return nums;
--#endif   
--#if !__GLIBC_PREREQ(2, 3)
-+#else
-+ #if !__GLIBC_PREREQ(2, 3)
-    return nums;
--#endif   
-+ #endif
- 
--#if !__GLIBC_PREREQ(2, 7)
-+ #if !__GLIBC_PREREQ(2, 7)
-   ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp);
-   if (ret!=0) return nums;
-   n=0;
--#if !__GLIBC_PREREQ(2, 6)  
-+  #if !__GLIBC_PREREQ(2, 6)
-   for (i=0;i<nums;i++)
-      if (CPU_ISSET(i,cpusetp)) n++;
-   nums=n;   
--#else
-+  #else
-   nums = CPU_COUNT(sizeof(cpu_set_t),cpusetp);
--#endif
-+  #endif
-   return nums;
--#endif
--
-+ #else
-   cpusetp = CPU_ALLOC(nums);
-   if (cpusetp == NULL) return nums;
-   size = CPU_ALLOC_SIZE(nums);
-@@ -214,6 +212,8 @@ int i,n;
-   nums = CPU_COUNT_S(size,cpusetp);
-   CPU_FREE(cpusetp);
-   return nums;
-+ #endif
-+#endif
- }
- #endif
- #endif