Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into v2-network

db6d2e16 · qiaolongfei · fdbc289a · f3298702 · db6d2e16
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

cmake/cblas.cmake cmake/cblas.cmake +2 -1

未找到文件。
--- a/cmake/cblas.cmake
+++ b/cmake/cblas.cmake
@@ -16,7 +16,8 @@
 set(CBLAS_FOUND OFF)

 ## Find MKL First.
-set(MKL_ROOT $ENV{MKLROOT} CACHE PATH "Folder contains MKL")
+set(INTEL_ROOT "/opt/intel" CACHE PATH "Folder contains intel libs")
+set(MKL_ROOT ${INTEL_ROOT}/mkl CACHE PATH "Folder contains MKL")

 find_path(MKL_INCLUDE_DIR mkl.h PATHS
  ${MKL_ROOT}/include)