From 954d3c76c8f9254c0f980fddf8d62639e078c20c Mon Sep 17 00:00:00 2001
From: Lv Tao <tao.a.lv@intel.com>
Date: Wed, 7 Nov 2018 15:20:20 +0800
Subject: [PATCH 1/5] update mkml

---
 CMakeLists.txt                              | 2 +-
 ci/docker/install/ubuntu_mklml.sh           | 2 +-
 cmake/{MklDnn.cmake => DownloadMKLML.cmake} | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename cmake/{MklDnn.cmake => DownloadMKLML.cmake} (86%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cea683e8f56..42f6bffb9207 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,7 +224,7 @@ if(ENABLE_TESTCOVERAGE)
 endif()
 
 if(USE_MKLDNN)
-  include(cmake/MklDnn.cmake)
+  include(cmake/DownloadMKLML.cmake)
   # CPU architecture (e.g., C5) can't run on another architecture (e.g., g3).
   if(NOT MSVC)
     set(ARCH_OPT_FLAGS "-mtune=generic")
diff --git a/ci/docker/install/ubuntu_mklml.sh b/ci/docker/install/ubuntu_mklml.sh
index 7e17295f4208..862e2846403a 100755
--- a/ci/docker/install/ubuntu_mklml.sh
+++ b/ci/docker/install/ubuntu_mklml.sh
@@ -21,5 +21,5 @@
 # the whole docker cache for the image
 
 set -ex
-wget -q --no-check-certificate -O /tmp/mklml.tgz https://github.com/intel/mkl-dnn/releases/download/v0.14/mklml_lnx_2018.0.3.20180406.tgz
+wget -q --no-check-certificate -O /tmp/mklml.tgz https://github.com/intel/mkl-dnn/releases/download/v0.17-rc/mklml_lnx_2019.0.1.20180928.tgz
 tar -zxf /tmp/mklml.tgz && cp -rf mklml_*/* /usr/local/ && rm -rf mklml_*
diff --git a/cmake/MklDnn.cmake b/cmake/DownloadMKLML.cmake
similarity index 86%
rename from cmake/MklDnn.cmake
rename to cmake/DownloadMKLML.cmake
index acaf878b2f45..193517424ebd 100644
--- a/cmake/MklDnn.cmake
+++ b/cmake/DownloadMKLML.cmake
@@ -19,8 +19,8 @@
 
 message(STATUS "download mklml")
 if(MSVC)
-  set(MKL_NAME "mklml_win_2018.0.3.20180406")
-  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/v0.14/${MKL_NAME}.zip" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" EXPECTED_MD5 "8DD73E7D3F19F004551809824C4E8970" SHOW_PROGRESS)
+  set(MKL_NAME "mklml_win_2019.0.1.20180928")
+  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/v0.17-rc/${MKL_NAME}.zip" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" EXPECTED_MD5 "443e661bdfd32dbbc99b460b43afceee" SHOW_PROGRESS)
   file(DOWNLOAD "https://github.com/apache/incubator-mxnet/releases/download/utils/7z.exe" "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe" EXPECTED_MD5 "E1CF766CF358F368EC97662D06EA5A4C" SHOW_PROGRESS)
   
   execute_process(COMMAND "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe" "-o${CMAKE_CURRENT_BINARY_DIR}/mklml/" "-y")
@@ -31,8 +31,8 @@ if(MSVC)
   file(COPY ${MKLROOT}/lib/mklml.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
   file(COPY ${CMAKE_SOURCE_DIR}/3rdparty/mkldnn/config_template.vcxproj.user DESTINATION ${CMAKE_SOURCE_DIR})
 elseif(UNIX)
-  set(MKL_NAME "mklml_lnx_2018.0.3.20180406")
-  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/v0.14/${MKL_NAME}.tgz" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" EXPECTED_MD5 "DAF7EFC3C1C0036B447213004467A8AE" SHOW_PROGRESS)
+  set(MKL_NAME "mklml_lnx_2019.0.1.20180928")
+  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/v0.17-rc/${MKL_NAME}.tgz" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" EXPECTED_MD5 "a63abf155361322b9c03f8fc50f4f317" SHOW_PROGRESS)
   execute_process(COMMAND "tar" "-xzf" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" "-C" "${CMAKE_CURRENT_BINARY_DIR}/mklml/")
   set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
   include_directories(${MKLROOT}/include)

From 8ea44c3b8b3d13c1d3fa8fd4a6e331f197c0d7cd Mon Sep 17 00:00:00 2001
From: Lv Tao <tao.a.lv@intel.com>
Date: Mon, 12 Nov 2018 14:59:29 +0800
Subject: [PATCH 2/5] refine DownloadMKLML.cmake

---
 cmake/DownloadMKLML.cmake | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cmake/DownloadMKLML.cmake b/cmake/DownloadMKLML.cmake
index 193517424ebd..ddc04dc96061 100644
--- a/cmake/DownloadMKLML.cmake
+++ b/cmake/DownloadMKLML.cmake
@@ -18,9 +18,13 @@
 #this file download mklml
 
 message(STATUS "download mklml")
+
+set(MKLURLROOT "https://github.com/intel/mkl-dnn/releases/download/v0.17-rc/")
+set(MKLVERSION "2019.0.1.20180928")
+
 if(MSVC)
-  set(MKL_NAME "mklml_win_2019.0.1.20180928")
-  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/v0.17-rc/${MKL_NAME}.zip" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" EXPECTED_MD5 "443e661bdfd32dbbc99b460b43afceee" SHOW_PROGRESS)
+  set(MKL_NAME "mklml_win_${MKLVERSION}")
+  file(DOWNLOAD "${MKLURLROOT}${MKL_NAME}.zip" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" EXPECTED_MD5 "443e661bdfd32dbbc99b460b43afceee" SHOW_PROGRESS)
   file(DOWNLOAD "https://github.com/apache/incubator-mxnet/releases/download/utils/7z.exe" "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe" EXPECTED_MD5 "E1CF766CF358F368EC97662D06EA5A4C" SHOW_PROGRESS)
   
   execute_process(COMMAND "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe" "-o${CMAKE_CURRENT_BINARY_DIR}/mklml/" "-y")
@@ -31,8 +35,8 @@ if(MSVC)
   file(COPY ${MKLROOT}/lib/mklml.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
   file(COPY ${CMAKE_SOURCE_DIR}/3rdparty/mkldnn/config_template.vcxproj.user DESTINATION ${CMAKE_SOURCE_DIR})
 elseif(UNIX)
-  set(MKL_NAME "mklml_lnx_2019.0.1.20180928")
-  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/v0.17-rc/${MKL_NAME}.tgz" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" EXPECTED_MD5 "a63abf155361322b9c03f8fc50f4f317" SHOW_PROGRESS)
+  set(MKL_NAME "mklml_lnx_${MKLVERSION}")
+  file(DOWNLOAD "${MKLURLROOT}${MKL_NAME}.tgz" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" EXPECTED_MD5 "a63abf155361322b9c03f8fc50f4f317" SHOW_PROGRESS)
   execute_process(COMMAND "tar" "-xzf" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" "-C" "${CMAKE_CURRENT_BINARY_DIR}/mklml/")
   set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
   include_directories(${MKLROOT}/include)

From 96c169fd48044056b95d5242792f226e7e23cbf3 Mon Sep 17 00:00:00 2001
From: Lv Tao <tao.a.lv@intel.com>
Date: Mon, 12 Nov 2018 16:13:11 +0800
Subject: [PATCH 3/5] merge DownloadMKLML.cmake from #11148

---
 cmake/DownloadMKLML.cmake | 65 ++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/cmake/DownloadMKLML.cmake b/cmake/DownloadMKLML.cmake
index ddc04dc96061..de25bdc8b670 100644
--- a/cmake/DownloadMKLML.cmake
+++ b/cmake/DownloadMKLML.cmake
@@ -15,34 +15,57 @@
 # specific language governing permissions and limitations
 # under the License.
 
-#this file download mklml
+# This script will download MKLML
 
-message(STATUS "download mklml")
+message(STATUS "Downloading MKLML...")
 
-set(MKLURLROOT "https://github.com/intel/mkl-dnn/releases/download/v0.17-rc/")
-set(MKLVERSION "2019.0.1.20180928")
+set(MKLML_RELEASE v0.17-rc)
+set(MKLML_RELEASE_FILE_SUFFIX 2019.0.1.20180928)
 
 if(MSVC)
-  set(MKL_NAME "mklml_win_${MKLVERSION}")
-  file(DOWNLOAD "${MKLURLROOT}${MKL_NAME}.zip" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" EXPECTED_MD5 "443e661bdfd32dbbc99b460b43afceee" SHOW_PROGRESS)
-  file(DOWNLOAD "https://github.com/apache/incubator-mxnet/releases/download/utils/7z.exe" "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe" EXPECTED_MD5 "E1CF766CF358F368EC97662D06EA5A4C" SHOW_PROGRESS)
-  
+  set(MKL_NAME "mklml_win_${MKLML_RELEASE_FILE_SUFFIX}")
+
+  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLML_RELEASE}/${MKL_NAME}.zip"
+       "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip"
+       EXPECTED_MD5 "443e661bdfd32dbbc99b460b43afceee" SHOW_PROGRESS)
+  file(DOWNLOAD "https://github.com/apache/incubator-mxnet/releases/download/utils/7z.exe"
+       "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe"
+       EXPECTED_MD5 "E1CF766CF358F368EC97662D06EA5A4C" SHOW_PROGRESS)
+
   execute_process(COMMAND "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe" "-o${CMAKE_CURRENT_BINARY_DIR}/mklml/" "-y")
-  execute_process(COMMAND "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z.exe" "x" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" "-o${CMAKE_CURRENT_BINARY_DIR}/mklml/" "-y")
+  execute_process(COMMAND "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z.exe"
+                  "x" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" "-o${CMAKE_CURRENT_BINARY_DIR}/mklml/" "-y")
+
+  set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
+
+  message(STATUS "Setting MKLROOT path to ${MKLROOT}")
+
+elseif(APPLE)
+  set(MKL_NAME "mklml_mac_${MKLML_RELEASE_FILE_SUFFIX}")
+
+  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLML_RELEASE}/${MKL_NAME}.tgz"
+       "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz"
+       EXPECTED_MD5 "95f887af332205b1d15b392260003952" SHOW_PROGRESS)
+  execute_process(COMMAND "tar" "-xzf" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz"
+                  "-C" "${CMAKE_CURRENT_BINARY_DIR}/mklml/")
+
   set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
-  include_directories(${MKLROOT}/include)
-  file(COPY ${MKLROOT}/lib/libiomp5md.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-  file(COPY ${MKLROOT}/lib/mklml.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-  file(COPY ${CMAKE_SOURCE_DIR}/3rdparty/mkldnn/config_template.vcxproj.user DESTINATION ${CMAKE_SOURCE_DIR})
+
+  message(STATUS "Setting MKLROOT path to ${MKLROOT}")
+
 elseif(UNIX)
-  set(MKL_NAME "mklml_lnx_${MKLVERSION}")
-  file(DOWNLOAD "${MKLURLROOT}${MKL_NAME}.tgz" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" EXPECTED_MD5 "a63abf155361322b9c03f8fc50f4f317" SHOW_PROGRESS)
-  execute_process(COMMAND "tar" "-xzf" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" "-C" "${CMAKE_CURRENT_BINARY_DIR}/mklml/")
+  set(MKL_NAME "mklml_lnx_${MKLML_RELEASE_FILE_SUFFIX}")
+
+  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLML_RELEASE}/${MKL_NAME}.tgz"
+       "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz"
+       EXPECTED_MD5 "a63abf155361322b9c03f8fc50f4f317" SHOW_PROGRESS)
+  execute_process(COMMAND "tar" "-xzf" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz"
+                  "-C" "${CMAKE_CURRENT_BINARY_DIR}/mklml/")
+
   set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
-  include_directories(${MKLROOT}/include)
-  file(COPY ${MKLROOT}/lib/libiomp5.so DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-  file(COPY ${MKLROOT}/lib/libmklml_gnu.so DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-  file(COPY ${MKLROOT}/lib/libmklml_intel.so DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+  message(STATUS "Setting MKLROOT path to ${MKLROOT}")
+
 else()
-  message(FATAL_ERROR "not support now")
+  message(FATAL_ERROR "Wrong platform")
 endif()

From 0e53ef4de20f244feab72348743b3fce901b02c1 Mon Sep 17 00:00:00 2001
From: Lv Tao <tao.a.lv@intel.com>
Date: Mon, 12 Nov 2018 16:25:13 +0800
Subject: [PATCH 4/5] fix mkldnn release version

---
 cmake/DownloadMKLML.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/DownloadMKLML.cmake b/cmake/DownloadMKLML.cmake
index de25bdc8b670..a25f69e0c559 100644
--- a/cmake/DownloadMKLML.cmake
+++ b/cmake/DownloadMKLML.cmake
@@ -19,13 +19,13 @@
 
 message(STATUS "Downloading MKLML...")
 
-set(MKLML_RELEASE v0.17-rc)
+set(MKLDNN_RELEASE v0.17-rc)
 set(MKLML_RELEASE_FILE_SUFFIX 2019.0.1.20180928)
 
 if(MSVC)
   set(MKL_NAME "mklml_win_${MKLML_RELEASE_FILE_SUFFIX}")
 
-  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLML_RELEASE}/${MKL_NAME}.zip"
+  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLDNN_RELEASE}/${MKL_NAME}.zip"
        "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip"
        EXPECTED_MD5 "443e661bdfd32dbbc99b460b43afceee" SHOW_PROGRESS)
   file(DOWNLOAD "https://github.com/apache/incubator-mxnet/releases/download/utils/7z.exe"
@@ -43,7 +43,7 @@ if(MSVC)
 elseif(APPLE)
   set(MKL_NAME "mklml_mac_${MKLML_RELEASE_FILE_SUFFIX}")
 
-  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLML_RELEASE}/${MKL_NAME}.tgz"
+  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLDNN_RELEASE}/${MKL_NAME}.tgz"
        "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz"
        EXPECTED_MD5 "95f887af332205b1d15b392260003952" SHOW_PROGRESS)
   execute_process(COMMAND "tar" "-xzf" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz"
@@ -56,7 +56,7 @@ elseif(APPLE)
 elseif(UNIX)
   set(MKL_NAME "mklml_lnx_${MKLML_RELEASE_FILE_SUFFIX}")
 
-  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLML_RELEASE}/${MKL_NAME}.tgz"
+  file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/${MKLDNN_RELEASE}/${MKL_NAME}.tgz"
        "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz"
        EXPECTED_MD5 "a63abf155361322b9c03f8fc50f4f317" SHOW_PROGRESS)
   execute_process(COMMAND "tar" "-xzf" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz"

From a7fa18c4ef75dd08091561adc6905b039cec3319 Mon Sep 17 00:00:00 2001
From: Lv Tao <tao.a.lv@intel.com>
Date: Mon, 12 Nov 2018 17:09:45 +0800
Subject: [PATCH 5/5] fix windows compilation

---
 cmake/DownloadMKLML.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/DownloadMKLML.cmake b/cmake/DownloadMKLML.cmake
index a25f69e0c559..c2c1cd6916f6 100644
--- a/cmake/DownloadMKLML.cmake
+++ b/cmake/DownloadMKLML.cmake
@@ -40,6 +40,8 @@ if(MSVC)
 
   message(STATUS "Setting MKLROOT path to ${MKLROOT}")
 
+  include_directories(${MKLROOT}/include)
+
 elseif(APPLE)
   set(MKL_NAME "mklml_mac_${MKLML_RELEASE_FILE_SUFFIX}")