Merge branch 'master' into jbobba/mkldnn-outlining

src/ngraph/runtime/cpu/cpu_emitter.cpp

@@ -948,11 +948,15 @@ void runtime::cpu::CPU_Emitter::EmitReshape(codegen::CodeWriter& writer,
             writer << "}\n";
         }
     }
-    // Other cases (reordering of axes for tensors with rank>2) are not handled yet.
+    // Other cases
     else
     {
-        throw ngraph_error(
-            "Axis permutation in reshape is not implemented yet for tensors with rank>2");
+        writer << "kernel::reshape<" << out[0].get_type() << ">(" << args[0].get_name() << ",\n";
+        writer << "                " << out[0].get_name() << ",\n";
+        writer << "               {" << join(args[0].get_shape()) << "},\n";
+        writer << "               {" << join(reshape->get_input_order()) << "},\n";
+        writer << "               {" << join(out[0].get_shape()) << "}\n";
+        writer << "               );\n";
     }
 #else
     kernel::emit_reshape(writer,
@@ -2369,8 +2373,8 @@ void runtime::cpu::CPU_Emitter::EmitAvgPoolBackprop(
     writer << "                 {" << join(apb->get_window_shape()) << "},\n";
     writer << "                 {" << join(apb->get_window_movement_strides()) << "},\n";
     writer << "                 {" << join(apb->get_padding_below()) << "},\n";
-    writer << "                 {" << join(apb->get_padding_above()) << "},\n";
-    writer << "                 true);\n";
+    writer << "                 {" << join(apb->get_padding_above()) << "}\n";
+    writer << "                 );\n";
 }
 
 void runtime::cpu::CPU_Emitter::EmitMaxPoolBackprop(
@@ -2393,8 +2397,8 @@ void runtime::cpu::CPU_Emitter::EmitMaxPoolBackprop(
     writer << "                 {" << join(mpb->get_window_shape()) << "},\n";
     writer << "                 {" << join(mpb->get_window_movement_strides()) << "},\n";
     writer << "                 {" << join(mpb->get_padding_below()) << "},\n";
-    writer << "                 {" << join(mpb->get_padding_above()) << "},\n";
-    writer << "                 true);\n";
+    writer << "                 {" << join(mpb->get_padding_above()) << "}\n";
+    writer << "                 );\n";
 }
 
 //------------------------------------------------------------------------------------------------

src/ngraph/runtime/cpu/cpu_external_function.cpp

@@ -270,6 +270,7 @@ void runtime::cpu::CPU_ExternalFunction::compile()
 #include "ngraph/runtime/kernel/reduce.hpp"
 #include "ngraph/runtime/kernel/reduce_window.hpp"
 #include "ngraph/runtime/kernel/replace_slice.hpp"
+#include "ngraph/runtime/kernel/reshape.hpp"
 #include "ngraph/runtime/kernel/reverse.hpp"
 #include "ngraph/runtime/kernel/select_and_scatter.hpp"
 #include "ngraph/runtime/kernel/slice.hpp"