Compile with MKL in conda-build

Summary: Problem: Without -DBLAS=MKL, conda-build won't include MKL library into Caffe2 build. And the BLAS performance is bad on CPU. Solution: Explicitly add the flag. Add mkl and mkl-include as dependencies. ezyang Yangqing Closes facebookarchive/caffe2#1264 Reviewed By: bddppq Differential Revision: D5919192 Pulled By: houseroad fbshipit-source-id: bb51e4fc4015212694404180a610e06ec8ddb424
achraf-mer · Sep 28, 2017 · 96b1754 · 96b1754
1 parent b9009df
commit 96b1754
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/conda/build.sh b/conda/build.sh
@@ -14,7 +14,7 @@ PYTHON_ARGS="$(python ./scripts/get_python_cmake_flags.py)"
 
 mkdir -p build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_PREFIX_PATH="$PREFIX" $CONDA_CMAKE_ARGS $PYTHON_ARGS ..
+cmake -DBLAS=MKL -DMKL_INCLUDE_DIR=$CONDA_PREFIX/include -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_PREFIX_PATH="$PREFIX" $CONDA_CMAKE_ARGS $PYTHON_ARGS ..
 make -j20
 
 make install/fast

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -26,6 +26,8 @@ requirements:
     - leveldb
     - lmdb
     - snappy
+    - mkl-include
+    - mkl
   run:
     - future
     - glog
@@ -38,6 +40,7 @@ requirements:
     - lmdb
     - snappy
     - future
+    - mkl
 
 about:
   home: https://caffe2.ai/
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,8 @@ requirements: @@
         - leveldb
         - lmdb
         - snappy
+        - mkl-include
+        - mkl
       run:
         - future
         - glog
@@ Expand All / @@ -38,6 +40,7 @@ requirements: @@
         - lmdb
         - snappy
         - future
+        - mkl
     about:
       home: https://caffe2.ai/
@@ Expand Down @@