Merge pull request #642 from NervanaSystems/jbobba/mkldnn_v0.13

Jbobba/mkldnn v0.13

cmake/external_mkldnn.cmake

@@ -23,7 +23,7 @@ include(ExternalProject)
 if(NGRAPH_CPU_ENABLE)
 
     set(MKLDNN_GIT_REPO_URL https://github.com/intel/mkl-dnn)
-    set(MKLDNN_GIT_TAG "3e1f8f5")
+    set(MKLDNN_GIT_TAG "dfe8f6d")
 
     # The 'BUILD_BYPRODUCTS' argument was introduced in CMake 3.2.
     if(${CMAKE_VERSION} VERSION_LESS 3.2)

src/ngraph/runtime/cpu/pass/cpu_layout.cpp

@@ -1037,19 +1037,19 @@ namespace ngraph
                 {
                     if (runtime::cpu::mkldnn_utils::use_mkldnn_kernel(node.get()))
                     {
-                        auto delta_layout =
-                            runtime::cpu::mkldnn_utils::get_input_mkldnn_format(node.get(), 5);
+                        auto input_layout =
+                            runtime::cpu::mkldnn_utils::get_input_mkldnn_format(node.get(), 2);
 
                         vector<memory::format> prim_input_formats;
                         vector<memory::format> prim_output_formats;
 
                         prim_input_formats.push_back(memory::format::x);  // gamma
                         prim_input_formats.push_back(memory::format::x);  // beta
-                        prim_input_formats.push_back(delta_layout);       // input
+                        prim_input_formats.push_back(input_layout);       // input
                         prim_input_formats.push_back(memory::format::x);  // mean
                         prim_input_formats.push_back(memory::format::x);  // variance
-                        prim_input_formats.push_back(delta_layout);       // delta
-                        prim_output_formats.push_back(delta_layout);      // dinput
+                        prim_input_formats.push_back(input_layout);       // delta
+                        prim_output_formats.push_back(input_layout);      // dinput
                         prim_output_formats.push_back(memory::format::x); // dgamma
                         prim_output_formats.push_back(memory::format::x); // dbeta
                         node =