提交 ab9a49b8 编写于 作者: T typhoonzero

follow comments

上级 b2b371f3
...@@ -103,6 +103,11 @@ if(ANDROID OR IOS) ...@@ -103,6 +103,11 @@ if(ANDROID OR IOS)
add_definitions(-DPADDLE_MOBILE_INFERENCE) add_definitions(-DPADDLE_MOBILE_INFERENCE)
endif() endif()
if (APPLE)
set(WITH_MKL OFF CACHE STRING
"Disable MKL for building on mac" FORCE)
endif()
set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING
"A path setting third party libraries download & build directories.") "A path setting third party libraries download & build directories.")
......
...@@ -28,9 +28,6 @@ IF(WIN32 OR APPLE) ...@@ -28,9 +28,6 @@ IF(WIN32 OR APPLE)
"Windows or Mac is not supported with MKLDNN in Paddle yet." "Windows or Mac is not supported with MKLDNN in Paddle yet."
"Force WITH_MKLDNN=OFF") "Force WITH_MKLDNN=OFF")
SET(WITH_MKLDNN OFF CACHE STRING "Disable MKLDNN in Windows and MacOS" FORCE) SET(WITH_MKLDNN OFF CACHE STRING "Disable MKLDNN in Windows and MacOS" FORCE)
IF ((NOT ${WITH_MKLDNN}) AND (NOT ${WITH_MKLML}))
SET(WITH_MKL OFF CACHE STRING "Disable MKL for later scripts" FORCE)
ENDIF()
return() return()
ENDIF() ENDIF()
......
...@@ -21,9 +21,6 @@ IF(WIN32 OR APPLE) ...@@ -21,9 +21,6 @@ IF(WIN32 OR APPLE)
"Windows or Mac is not supported with MKLML in Paddle yet." "Windows or Mac is not supported with MKLML in Paddle yet."
"Force WITH_MKLML=OFF") "Force WITH_MKLML=OFF")
SET(WITH_MKLML OFF CACHE STRING "Disable MKLML package in Windows and MacOS" FORCE) SET(WITH_MKLML OFF CACHE STRING "Disable MKLML package in Windows and MacOS" FORCE)
IF ((NOT ${WITH_MKLDNN}) AND (NOT ${WITH_MKLML}))
SET(WITH_MKL OFF CACHE STRING "Disable MKL for later scripts" FORCE)
ENDIF()
return() return()
ENDIF() ENDIF()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册