[incubator-mxnet] branch master updated: Fix compilation with USE_LAPACK=0 USE_BLAS=mkl (#19570)

[la...@apache.org]

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 13e9d57  Fix compilation with USE_LAPACK=0 USE_BLAS=mkl (#19570)
13e9d57 is described below

commit 13e9d572b3059ebe0d1d4f6d452db4f971375588
Author: Andrzej Kotłowski <An...@intel.com>
AuthorDate: Sat Nov 21 00:07:46 2020 +0100

    Fix compilation with USE_LAPACK=0 USE_BLAS=mkl (#19570)
---
 3rdparty/mshadow/mshadow/base.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/mshadow/mshadow/base.h b/3rdparty/mshadow/mshadow/base.h
index 9d04e7d..d4ea66d 100644
--- a/3rdparty/mshadow/mshadow/base.h
+++ b/3rdparty/mshadow/mshadow/base.h
@@ -337,7 +337,7 @@ const float kPi = 3.1415926f;
   typedef index_t openmp_index_t;
 #endif
 
-#if MSHADOW_USE_MKL
+#if MSHADOW_USE_MKL && MXNET_USE_LAPACK
   // lapack_index_t could be replaced by index_t and removed when all blas library support large tensor
   typedef index_t lapack_index_t;
 #else