update

cmake/external/mkldnn.cmake

@@ -28,7 +28,9 @@ 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)
-    SET(WITH_MKL OFF CACHE STRING "Disable MKL for later scripts" FORCE)
+    IF ((NOT ${WITH_MKLDNN}) AND (NOT ${WITH_MKLML}))
+        SET(WITH_MKL OFF CACHE STRING "Disable MKL for later scripts" FORCE)
+    ENDIF()
     return()
 ENDIF()
 

cmake/external/mklml.cmake

@@ -21,7 +21,9 @@ 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)
-    SET(WITH_MKL OFF CACHE STRING "Disable MKL for later scripts" FORCE)
+    IF ((NOT ${WITH_MKLDNN}) AND (NOT ${WITH_MKLML}))
+        SET(WITH_MKL OFF CACHE STRING "Disable MKL for later scripts" FORCE)
+    ENDIF()
     return()
 ENDIF()