Merge pull request apache#23 from jpauwels/refactor

Added config option to use system supplied BLAS library on OS X
stefanhenneking · Feb 9, 2015 · c594466 · c594466
2 parents af75a47 + 4bacb7b
commit c594466
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/guide/config.mk b/guide/config.mk
@@ -21,10 +21,10 @@ USE_CUDA_PATH = NONE
 
 #
 # choose the version of blas you want to use
-# can be: mkl, blas, atlas, openblas
+# can be: mkl, blas, atlas, openblas, apple
 USE_BLAS = blas
 #
-# add path to intel libary, you may need it
+# add path to intel library, you may need it
 # for MKL, if you did not add the path to enviroment variable
 # 
 USE_INTEL_PATH = NONE

diff --git a/make/mshadow.mk b/make/mshadow.mk
@@ -9,7 +9,7 @@
 #----------------------------------------------------------------------------------------
 
 MSHADOW_CFLAGS = -msse3 -funroll-loops -Wno-unused-parameter -Wno-unknown-pragmas
-MSHADOW_LDFLAGS = -lm 
+MSHADOW_LDFLAGS = -lm
 MSHADOW_NVCCFLAGS = 
 
 ifeq ($(USE_CUDA), 0)
@@ -38,6 +38,9 @@ else ifeq ($(USE_BLAS), atlas)
 	MSHADOW_LDFLAGS += -lcblas
 else ifeq ($(USE_BLAS), blas)
 	MSHADOW_LDFLAGS += -lblas
+else ifeq ($(USE_BLAS), apple)
+	MSHADOW_CFLAGS += -I/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Versions/Current/Headers/
+	MSHADOW_LDFLAGS += -framework Accelerate
 endif
 
 ifeq ($(PS_PATH), NONE)