From ab9a49b8285b62e73e311cfceb8d4c2721b44e52 Mon Sep 17 00:00:00 2001
From: typhoonzero <typhoonzero1986@gmail.com>
Date: Tue, 10 Jul 2018 13:31:57 +0800
Subject: [PATCH] follow comments

---
 CMakeLists.txt              | 5 +++++
 cmake/external/mkldnn.cmake | 3 ---
 cmake/external/mklml.cmake  | 3 ---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23bb27e77b9..3169086044c 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 5c095071632..20dda35c5cc 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 ba00f0fe63c..82c424fb79d 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()
 
-- 
GitLab