[incubator-mxnet] branch master updated: Fix CD failure due to illegal instruction in OpenBLAS (#18408)

[lausen]

This is an automated email from the ASF dual-hosted git repository.

lausen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 382279e  Fix CD failure due to illegal instruction in OpenBLAS (#18408)
382279e is described below

commit 382279e0d5b88b2bd05e6c00105fe1e9eb2bc600
Author: Leonard Lausen <lau...@amazon.com>
AuthorDate: Wed May 27 13:34:20 2020 -0700

    Fix CD failure due to illegal instruction in OpenBLAS (#18408)
    
    * Update to OpenBlas 0.3.10 pre-release
    
    Includes https://github.com/xianyi/OpenBLAS/pull/2527
    
    * Enable support for older architectures in OpenBLAS dynamic architecture 
feature
---
 tools/dependencies/README.md   |  2 +-
 tools/dependencies/openblas.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/dependencies/README.md b/tools/dependencies/README.md
index 5cd4efd..c898112 100644
--- a/tools/dependencies/README.md
+++ b/tools/dependencies/README.md
@@ -53,7 +53,7 @@ The dependencies could be categorized by several groups: BLAS 
libraries, CPU-bas
 
 | Dependencies  | MXNet Version |
 | :------------: |:-------------:| 
-|OpenBLAS| 0.3.3 |
+|OpenBLAS| 0.3.9 |
 |MKLDNN| 0.19 | 
 |CUDA| 10.1 |
 |cuDNN| 7.5.1 |
diff --git a/tools/dependencies/openblas.sh b/tools/dependencies/openblas.sh
index cdc63b6..dad566f 100755
--- a/tools/dependencies/openblas.sh
+++ b/tools/dependencies/openblas.sh
@@ -19,21 +19,21 @@
 
 # This script builds the static library of openblas that can be used as 
dependency of mxnet.
 set -ex
-OPENBLAS_VERSION=0.3.7
+OPENBLAS_VERSION=4a4c50a7cef9fa91f14e508722f502d956ad5192
 if [[ ((! -e $DEPS_PATH/lib/libopenblas.a) && -z "$CMAKE_STATICBUILD") ||
           ((! -e $DEPS_PATH/lib/libopenblas.so) && -v CMAKE_STATICBUILD) ]]; 
then
     # download and build openblas
     >&2 echo "Building openblas..."
 
     download \
-        https://github.com/xianyi/OpenBLAS/archive/v${OPENBLAS_VERSION}.zip \
+        https://github.com/xianyi/OpenBLAS/archive/${OPENBLAS_VERSION}.zip \
         ${DEPS_PATH}/openblas.zip
     unzip -q $DEPS_PATH/openblas.zip -d $DEPS_PATH
     pushd .
-    cd $DEPS_PATH/OpenBLAS-$OPENBLAS_VERSION
+    cd $DEPS_PATH/OpenBLAS-${OPENBLAS_VERSION}
 
     # Adding NO_DYNAMIC=1 flag causes make install to fail
-    CXX="g++ -fPIC" CC="gcc -fPIC" $MAKE DYNAMIC_ARCH=1 USE_OPENMP=1
+    CXX="g++ -fPIC" CC="gcc -fPIC" $MAKE DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 
USE_OPENMP=1
 
     if [[ -v CMAKE_STATICBUILD ]]; then
         # We link and redistribute libopenblas.so for cmake staticbuild
@@ -46,7 +46,7 @@ if [[ ((! -e $DEPS_PATH/lib/libopenblas.a) && -z 
"$CMAKE_STATICBUILD") ||
 
     if [[ -z "$CMAKE_STATICBUILD" ]]; then
         # Manually removing .so to avoid linking against it
-        rm $DEPS_PATH/lib/libopenblasp-r${OPENBLAS_VERSION}.so
+        rm $DEPS_PATH/lib/libopenblas*.so
     fi
 
     popd