From 1ee8c534ba4ac5e6f18a66854a0f3d2393f284a0 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Tue, 26 May 2020 18:00:48 +0000 Subject: [PATCH 1/3] Update OpenBLAS --- tools/dependencies/README.md | 2 +- tools/dependencies/openblas.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/dependencies/README.md b/tools/dependencies/README.md index 5cd4efd72064..c898112c3c93 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 cdc63b6a8355..96a4ad3f9d89 100755 --- a/tools/dependencies/openblas.sh +++ b/tools/dependencies/openblas.sh @@ -19,7 +19,7 @@ # 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=0.3.9 if [[ ((! -e $DEPS_PATH/lib/libopenblas.a) && -z "$CMAKE_STATICBUILD") || ((! -e $DEPS_PATH/lib/libopenblas.so) && -v CMAKE_STATICBUILD) ]]; then # download and build openblas From 8452e1249eda33bcd5a7dcdbea4d8eb4c87560d6 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Tue, 26 May 2020 18:28:21 +0000 Subject: [PATCH 2/3] Support older architectures in OpenBLAS --- tools/dependencies/openblas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dependencies/openblas.sh b/tools/dependencies/openblas.sh index 96a4ad3f9d89..f747da380cd0 100755 --- a/tools/dependencies/openblas.sh +++ b/tools/dependencies/openblas.sh @@ -33,7 +33,7 @@ if [[ ((! -e $DEPS_PATH/lib/libopenblas.a) && -z "$CMAKE_STATICBUILD") || 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 From dcfde1bdfb4ed3a1969929f13e790452732cb138 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Tue, 26 May 2020 19:26:00 +0000 Subject: [PATCH 3/3] Update to OpenBlas 0.3.10 pre-release Includes https://github.com/xianyi/OpenBLAS/pull/2527 --- tools/dependencies/openblas.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/dependencies/openblas.sh b/tools/dependencies/openblas.sh index f747da380cd0..dad566ff877d 100755 --- a/tools/dependencies/openblas.sh +++ b/tools/dependencies/openblas.sh @@ -19,18 +19,18 @@ # This script builds the static library of openblas that can be used as dependency of mxnet. set -ex -OPENBLAS_VERSION=0.3.9 +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 DYNAMIC_OLDER=1 USE_OPENMP=1 @@ -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