[incubator-mxnet] branch master updated: Compile with LAPACK shared library (#11483)

[zh...@apache.org]

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

zhasheng 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 99ac2f5  Compile with LAPACK shared library (#11483)
99ac2f5 is described below

commit 99ac2f571b3c4431e8a7bd64ad13035e22259cf9
Author: Dang Trung Kien <ki...@users.noreply.github.com>
AuthorDate: Tue Jul 3 01:56:54 2018 +0800

    Compile with LAPACK shared library (#11483)
    
    * Compile with LAPACK shared library
    
    * Add missing bracket
    
    * Reorder LAPACK paths
---
 Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d597cfb..2cf1ed1 100644
--- a/Makefile
+++ b/Makefile
@@ -156,10 +156,14 @@ endif
 # silently switching lapack off instead of letting the build fail because of backward compatibility
 ifeq ($(USE_LAPACK), 1)
 ifeq ($(USE_BLAS),$(filter $(USE_BLAS),blas openblas atlas mkl))
+ifeq (,$(wildcard $(USE_LAPACK_PATH)/liblapack.a))
+ifeq (,$(wildcard $(USE_LAPACK_PATH)/liblapack.so))
 ifeq (,$(wildcard /lib/liblapack.a))
+ifeq (,$(wildcard /lib/liblapack.so))
 ifeq (,$(wildcard /usr/lib/liblapack.a))
+ifeq (,$(wildcard /usr/lib/liblapack.so))
 ifeq (,$(wildcard /usr/lib64/liblapack.a))
-ifeq (,$(wildcard $(USE_LAPACK_PATH)/liblapack.a))
+ifeq (,$(wildcard /usr/lib64/liblapack.so))
 	USE_LAPACK = 0
         $(warning "USE_LAPACK disabled because libraries were not found")
 endif
@@ -168,6 +172,10 @@ endif
 endif
 endif
 endif
+endif
+endif
+endif
+endif
 
 # lapack settings.
 ifeq ($(USE_LAPACK), 1)