remove full mkl dependency for mkl call (apache#214)

stefanhenneking · Feb 15, 2017 · a9d70f0 · a9d70f0
1 parent 129a35b
commit a9d70f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/make/mshadow.mk b/make/mshadow.mk
@@ -54,14 +54,21 @@ else
 endif
 	MSHADOW_LDFLAGS += -L${MKLROOT}/../compiler/lib/intel64 -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -liomp5 -ldl -lpthread -lm
 else
-	MSHADOW_LDFLAGS += -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5
+ifneq ($(USE_MKLML), 1)
+  MSHADOW_LDFLAGS += -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5
+endif
 endif
 else
 ifneq ($(USE_BLAS), NONE)
 	MSHADOW_CFLAGS += -DMSHADOW_USE_CBLAS=1 -DMSHADOW_USE_MKL=0
 endif
 endif
 
+ifeq ($(USE_MKLML), 1)
+	MSHADOW_CFLAGS += -I$(MKLROOT)/include
+	MSHADOW_LDFLAGS += -Wl,--as-needed -lmklml_intel -lmklml_gnu -liomp5 -L$(MKLROOT)/lib/
+endif
+
 ifeq ($(USE_BLAS), openblas)
 	MSHADOW_LDFLAGS += -lopenblas
 else ifeq ($(USE_BLAS), atlas)

diff --git a/mshadow/base.h b/mshadow/base.h
@@ -136,7 +136,7 @@ extern "C" {
     #include <cblas.h>
 }
 #elif MSHADOW_USE_MKL
-  #include <mkl.h>
+  #include <mkl_blas.h>
   #include <mkl_cblas.h>
   #include <mkl_vsl.h>
   #include <mkl_vsl_functions.h>