diff --git a/CMakeLists.txt b/CMakeLists.txt index 23bb27e77b9eab0c322a71a8ff570d12d1050377..3169086044cf176de1b8221f986e6cc3341ae3d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,11 @@ if(ANDROID OR IOS) add_definitions(-DPADDLE_MOBILE_INFERENCE) 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 "A path setting third party libraries download & build directories.") diff --git a/cmake/external/mkldnn.cmake b/cmake/external/mkldnn.cmake index 5c09507163244248dd3468924631ab0ce4118d57..20dda35c5ccd98f5672d867c26ab97a215483543 100644 --- a/cmake/external/mkldnn.cmake +++ b/cmake/external/mkldnn.cmake @@ -28,9 +28,6 @@ IF(WIN32 OR APPLE) "Windows or Mac is not supported with MKLDNN in Paddle yet." "Force WITH_MKLDNN=OFF") 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() ENDIF() diff --git a/cmake/external/mklml.cmake b/cmake/external/mklml.cmake index ba00f0fe63cba17d851876b2ee7fe4875c2a0e48..82c424fb79d5596c31891bc395699bf9ff4e7e7e 100644 --- a/cmake/external/mklml.cmake +++ b/cmake/external/mklml.cmake @@ -21,9 +21,6 @@ IF(WIN32 OR APPLE) "Windows or Mac is not supported with MKLML in Paddle yet." "Force WITH_MKLML=OFF") 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() ENDIF()