From 72110d35083cfde12a335d37be0e54218d3cd3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Do=C5=82bniak?= <tomasz.dolbniak@intel.com>
Date: Thu, 17 Oct 2019 21:10:00 +0200
Subject: [PATCH] Patch for the MKLDNN v1 segfaults (#2145)

---
 cmake/external/ngraph.cmake                   |  3 +-
 .../{mkldnn_constexpr.patch => dnnl_v1.patch} | 34 +++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)
 rename cmake/patches/ngraph/{mkldnn_constexpr.patch => dnnl_v1.patch} (60%)

diff --git a/cmake/external/ngraph.cmake b/cmake/external/ngraph.cmake
index 023d6d53f6..18b61b2103 100644
--- a/cmake/external/ngraph.cmake
+++ b/cmake/external/ngraph.cmake
@@ -55,7 +55,7 @@ if (MSVC)
             PATCH_COMMAND ${NGRAPH_PATCH_DISCARD_COMMAND}
             COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/patches/ngraph/ngraph_onnx.cmake ${ngraph_SRC}/cmake/external_onnx.cmake
             COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/ngraph_protobuf.patch
-            COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/mkldnn_constexpr.patch
+            COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/dnnl_v1.patch
             CMAKE_ARGS
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                 -DNGRAPH_DEX_ONLY=ON
@@ -84,6 +84,7 @@ else()
             COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/patches/ngraph/ngraph_onnx.cmake ${ngraph_SRC}/cmake/external_onnx.cmake
             # TODO: Use cmake.file+copy as above.
             COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/ngraph_protobuf.patch
+            COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/dnnl_v1.patch
             CMAKE_ARGS
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                 -DNGRAPH_USE_PREBUILT_LLVM=TRUE
diff --git a/cmake/patches/ngraph/mkldnn_constexpr.patch b/cmake/patches/ngraph/dnnl_v1.patch
similarity index 60%
rename from cmake/patches/ngraph/mkldnn_constexpr.patch
rename to cmake/patches/ngraph/dnnl_v1.patch
index 649d416199..3227ffc66d 100644
--- a/cmake/patches/ngraph/mkldnn_constexpr.patch
+++ b/cmake/patches/ngraph/dnnl_v1.patch
@@ -1,18 +1,27 @@
 diff --git a/cmake/external_mkldnn_v1.cmake b/cmake/external_mkldnn_v1.cmake
-index fb77250c..d72d1b6c 100644
+index fb77250c8..94185ff34 100644
 --- a/cmake/external_mkldnn_v1.cmake
 +++ b/cmake/external_mkldnn_v1.cmake
-@@ -200,6 +200,7 @@ if (WIN32)
+@@ -200,6 +200,8 @@ if (WIN32)
          CONFIGURE_COMMAND
          PATCH_COMMAND ${MKLDNN_PATCH_REVERT_COMMAND}
          COMMAND git apply --ignore-space-change --ignore-whitespace ${CMAKE_SOURCE_DIR}/cmake/${MKLDNN_PATCH_FILE}
 +        COMMAND git apply --ignore-space-change --ignore-whitespace ${CMAKE_SOURCE_DIR}/cmake/mkldnn_constexpr.patch
++        COMMAND git apply --ignore-space-change --ignore-whitespace ${CMAKE_SOURCE_DIR}/cmake/mkldnn_memory_zero_pad.patch
+         CMAKE_GENERATOR ${CMAKE_GENERATOR}
+         CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
+         CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
+@@ -233,6 +235,7 @@ else()
+         CONFIGURE_COMMAND
+         PATCH_COMMAND ${MKLDNN_PATCH_REVERT_COMMAND}
+         COMMAND git apply ${CMAKE_SOURCE_DIR}/cmake/${MKLDNN_PATCH_FILE}
++        COMMAND git apply --ignore-space-change --ignore-whitespace ${CMAKE_SOURCE_DIR}/cmake/mkldnn_memory_zero_pad.patch
          CMAKE_GENERATOR ${CMAKE_GENERATOR}
          CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
          CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
 diff --git a/cmake/mkldnn_constexpr.patch b/cmake/mkldnn_constexpr.patch
 new file mode 100644
-index 00000000..86e99cc8
+index 000000000..27a869cd7
 --- /dev/null
 +++ b/cmake/mkldnn_constexpr.patch
 @@ -0,0 +1,43 @@
@@ -59,3 +68,22 @@ index 00000000..86e99cc8
 + 
 +     private:
 +         const dim_t cacheline_size_ = 64; // bytes
+diff --git a/cmake/mkldnn_memory_zero_pad.patch b/cmake/mkldnn_memory_zero_pad.patch
+new file mode 100644
+index 000000000..c0044a46c
+--- /dev/null
++++ b/cmake/mkldnn_memory_zero_pad.patch
+@@ -0,0 +1,13 @@
++diff --git a/src/common/memory_zero_pad.cpp b/src/common/memory_zero_pad.cpp
++index d10be49d..fbe11b08 100644
++--- a/src/common/memory_zero_pad.cpp
+++++ b/src/common/memory_zero_pad.cpp
++@@ -63,7 +63,7 @@ void typed_zero_pad_blk(
++ 
++     const int A = A_blocked ? pdims[0] / blksize : dims[0];
++     const int B = B_blocked ? pdims[1] / blksize : dims[1];
++-    const int C = C_blocked ? pdims[2] / blksize : dims[2];
+++    const int C = m_d.ndims() > 2 ? (C_blocked ? pdims[2] / blksize : dims[2]) : 1;
++     const int D = m_d.ndims() > 3 ? dims[3] : 1;
++     const int E = m_d.ndims() > 4 ? dims[4] : 1;
++     const int F = m_d.ndims() > 5 ? dims[5] : 1;