From efc591c5d1ef606dcc79b05a9f349552212e4a20 Mon Sep 17 00:00:00 2001
From: sreekanth_yalachigere <sreekanth.v.yalachigere@intel.com>
Date: Wed, 4 Dec 2019 13:13:11 -0800
Subject: [PATCH] DNNL CMAKE update

---
 cmake/external/dnnl.cmake            |  2 +-
 cmake/patches/mkldnn/constexpr.patch | 43 ----------------------------
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 cmake/patches/mkldnn/constexpr.patch

diff --git a/cmake/external/dnnl.cmake b/cmake/external/dnnl.cmake
index 144a46c33961d..a1aa3e1260d35 100644
--- a/cmake/external/dnnl.cmake
+++ b/cmake/external/dnnl.cmake
@@ -77,7 +77,7 @@ if (onnxruntime_USE_DNNL)
     GIT_TAG ${DNNL_TAG}
     # PATCH_COMMAND ${MKLDNN_PATCH_DISCARD_COMMAND} COMMAND ${DNNL_PATCH_COMMAND}
     SOURCE_DIR ${DNNL_SOURCE}
-    CMAKE_ARGS -DDNNL_PRODUCT_BUILD_MODE=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${DNNL_INSTALL} -DMKLROOT=${MKML_DIR}
+    CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${DNNL_INSTALL}
   )
   link_directories(${DNNL_LIB_DIR})
   #if (onnxruntime_USE_MKLML)
diff --git a/cmake/patches/mkldnn/constexpr.patch b/cmake/patches/mkldnn/constexpr.patch
deleted file mode 100644
index 8b57c95c65d76..0000000000000
--- a/cmake/patches/mkldnn/constexpr.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/cpu/rnn/rnn_reorders.hpp b/src/cpu/rnn/rnn_reorders.hpp
-index fbfedd01..28a6dc1d 100644
---- a/src/cpu/rnn/rnn_reorders.hpp
-+++ b/src/cpu/rnn/rnn_reorders.hpp
-@@ -128,7 +128,7 @@ struct rnn_weights_reorder_t : public cpu_primitive_t {
-             return status::success;
-         }
- 
--        format_tag_t itag_;
-+        format_tag_t itag_ = mkldnn_format_tag_undef;
- 
-     private:
-         void init_scratchpad() {
-diff --git a/src/cpu/simple_concat.hpp b/src/cpu/simple_concat.hpp
-index fe84eb14..f1b2bd17 100644
---- a/src/cpu/simple_concat.hpp
-+++ b/src/cpu/simple_concat.hpp
-@@ -98,9 +98,9 @@ struct simple_concat_t: public cpu_primitive_t {
-             return status::success;
-         }
- 
--        int perm_[MKLDNN_MAX_NDIMS];
--        int iperm_[MKLDNN_MAX_NDIMS];
--        dims_t blocks_;
-+        int perm_[MKLDNN_MAX_NDIMS] {};
-+        int iperm_[MKLDNN_MAX_NDIMS] {};
-+        dims_t blocks_ {};
- 
-         dim_t nelems_to_concat(const memory_desc_wrapper &data_d) const {
-             const int ndims = data_d.ndims();
-diff --git a/src/cpu/simple_sum.hpp b/src/cpu/simple_sum.hpp
-index 46a24810..c47c4a64 100644
---- a/src/cpu/simple_sum.hpp
-+++ b/src/cpu/simple_sum.hpp
-@@ -71,7 +71,7 @@ struct simple_sum_t: public cpu_primitive_t {
-         }
- 
-         sum_bf16_params_t bf16_p_;
--        dim_t block_size_, nelems_, blocks_number_, tail_;
-+        dim_t block_size_ = 0, nelems_= 0, blocks_number_= 0, tail_= 0;
- 
-     private:
-         const dim_t cacheline_size_ = 64; // bytes