Skip to content

Commit ab9a49b

Browse files
committed
follow comments
1 parent b2b371f commit ab9a49b

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ if(ANDROID OR IOS)
103103
add_definitions(-DPADDLE_MOBILE_INFERENCE)
104104
endif()
105105

106+
if (APPLE)
107+
set(WITH_MKL OFF CACHE STRING
108+
"Disable MKL for building on mac" FORCE)
109+
endif()
110+
106111
set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING
107112
"A path setting third party libraries download & build directories.")
108113

cmake/external/mkldnn.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ IF(WIN32 OR APPLE)
2828
"Windows or Mac is not supported with MKLDNN in Paddle yet."
2929
"Force WITH_MKLDNN=OFF")
3030
SET(WITH_MKLDNN OFF CACHE STRING "Disable MKLDNN in Windows and MacOS" FORCE)
31-
IF ((NOT ${WITH_MKLDNN}) AND (NOT ${WITH_MKLML}))
32-
SET(WITH_MKL OFF CACHE STRING "Disable MKL for later scripts" FORCE)
33-
ENDIF()
3431
return()
3532
ENDIF()
3633

cmake/external/mklml.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ IF(WIN32 OR APPLE)
2121
"Windows or Mac is not supported with MKLML in Paddle yet."
2222
"Force WITH_MKLML=OFF")
2323
SET(WITH_MKLML OFF CACHE STRING "Disable MKLML package in Windows and MacOS" FORCE)
24-
IF ((NOT ${WITH_MKLDNN}) AND (NOT ${WITH_MKLML}))
25-
SET(WITH_MKL OFF CACHE STRING "Disable MKL for later scripts" FORCE)
26-
ENDIF()
2724
return()
2825
ENDIF()
2926

0 commit comments

Comments
 (0)