Skip to content

Commit 2c5a24e

Browse files
committed
Merge pull request BVLC#3756 from intelcaffe/mkl-cosmetic-imprvmnts
[build] MKL support improvements
2 parents e5315fe + 326a486 commit 2c5a24e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Diff for: cmake/Modules/FindMKL.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ caffe_option(MKL_MULTI_THREADED "Use multi-threading" ON IF NOT MKL_USE_SINGL
2020

2121
# ---[ Root folders
2222
set(INTEL_ROOT "/opt/intel" CACHE PATH "Folder contains intel libs")
23-
find_path(MKL_ROOT include/mkl.h PATHS $ENV{MKL_ROOT} ${INTEL_ROOT}/mkl
23+
find_path(MKL_ROOT include/mkl.h PATHS $ENV{MKLROOT} ${INTEL_ROOT}/mkl
2424
DOC "Folder contains MKL")
2525

2626
# ---[ Find include dir

Diff for: docs/installation.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ There are several implementations of this library. The choice is yours:
5454
* [ATLAS](http://math-atlas.sourceforge.net/): free, open source, and so the default for Caffe.
5555
* [Intel MKL](http://software.intel.com/en-us/intel-mkl): commercial and optimized for Intel CPUs, with a free trial and [student](http://software.intel.com/en-us/intel-education-offerings) licenses.
5656
1. Install MKL.
57-
2. Set `BLAS := mkl` in `Makefile.config`
57+
2. Set up MKL environment (Details: [Linux](https://software.intel.com/en-us/node/528499), [OS X](https://software.intel.com/en-us/node/528659)). Example: *source /opt/intel/mkl/bin/mklvars.sh intel64*
58+
3. Set `BLAS := mkl` in `Makefile.config`
5859
* [OpenBLAS](http://www.openblas.net/): free and open source; this optimized and parallel BLAS could require more effort to install, although it might offer a speedup.
5960
1. Install OpenBLAS
6061
2. Set `BLAS := open` in `Makefile.config`

0 commit comments

Comments
 (0)