Merge pull request apache#25 from jpauwels/refactor

Made Intel MKL path platform dependent
stefanhenneking · Feb 14, 2015 · 574c679 · 574c679
2 parents 197c9e6 + 00dab41
commit 574c679
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/make/mshadow.mk b/make/mshadow.mk
@@ -24,8 +24,14 @@ endif
 
 ifeq ($(USE_BLAS), mkl)
 ifneq ($(USE_INTEL_PATH), NONE)
-	MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/mkl/lib/intel64
-	MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/lib/intel64
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S),Darwin)
+		MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/mkl/lib
+		MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/lib
+	else
+		MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/mkl/lib/intel64
+		MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/lib/intel64
+	endif
 	MSHADOW_CFLAGS += -I$(USE_INTEL_PATH)/mkl/include
 endif
 	MSHADOW_LDFLAGS += -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5