Merge pull request #3734 from NervanaSystems/ayzhuang/reshape_rotation_0.26

Migrate PR#3710 from master.

src/ngraph/runtime/cpu/mkldnn_utils.cpp

@@ -1325,6 +1325,12 @@ memory::desc runtime::cpu::mkldnn_utils::rotate_blocked_md(const memory::desc& i
     md.data_type = in.data.data_type;
     md.format_desc.blocking.inner_nblks = in.data.format_desc.blocking.inner_nblks;
 
+    AxisVector inverse_axis_order(in.data.ndims);
+    for (size_t i = 0; i < in.data.ndims; i++)
+    {
+        inverse_axis_order[axis_order[i]] = i;
+    }
+
     for (size_t i = 0; i < in.data.ndims; i++)
     {
         md.padded_dims[i] = in.data.padded_dims[axis_order[i]];
@@ -1337,7 +1343,7 @@ memory::desc runtime::cpu::mkldnn_utils::rotate_blocked_md(const memory::desc& i
     {
         md.format_desc.blocking.inner_blks[i] = in.data.format_desc.blocking.inner_blks[i];
         md.format_desc.blocking.inner_idxs[i] =
-            axis_order[in.data.format_desc.blocking.inner_idxs[i]];
+            inverse_axis_order[in.data.format_desc.blocking.inner_idxs[i]];
     }
 
     md.offset0 = in.data.offset0;

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

@@ -1895,12 +1895,7 @@ namespace ngraph
                         if (input_shape[axis_order[i]] != output_shape[i])
                             return false;
                     }
-#if MKLDNN_VERSION_MAJOR >= 1
-                    if (mkldnn_utils::is_mkldnn_desc_blocked_data_format(md))
-                    {
-                        return false;
-                    }
-#endif
+
                     return true;
                 }