Migrate from master (#2858)

src/ngraph/runtime/cpu/cpu_emitter.cpp

@@ -2494,8 +2494,6 @@ namespace ngraph
                     writer << "cg_ctx->set_memory_ptr(" << to_string(deps[1]) << ", "
                            << args[1].get_name() << ");\n";
                     writer << "cg_ctx->set_memory_ptr(" << to_string(deps[2]) << ", "
-                           << args[2].get_name() << ");\n";
-                    writer << "cg_ctx->set_memory_ptr(" << to_string(deps[3]) << ", "
                            << out[0].get_name() << ");\n";
                     writer << "cg_ctx->mkldnn_invoke_primitive(" << to_string(conv_index) << ");\n";
                 }

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

@@ -820,34 +820,47 @@ namespace ngraph
                     }
                     writer << "*cg_ctx->mkldnn_descriptors[" << desc_index + (descs.size() - 1)
                            << "],\n"
-                              "mkldnn::memory::dims{"
-                           << std::to_string(strides[0]) << ", " << std::to_string(strides[1]);
-                    if (strides.size() == 3)
+                              "mkldnn::memory::dims{";
+                    if (strides.size() > 1)
                     {
-                        writer << ", " << std::to_string(strides[2]);
+                        for (auto i = 0; i < strides.size() - 1; i++)
+                        {
+                            writer << std::to_string(strides[i]) << ", ";
+                        }
                     }
+                    writer << std::to_string(strides[strides.size() - 1]);
                     writer << "},\n"
-                              "mkldnn::memory::dims{"
-                           << std::to_string(window_dilation_strides_adjusted[0]) << ", "
-                           << std::to_string(window_dilation_strides_adjusted[1]);
-                    if (window_dilation_strides_adjusted.size() == 3)
+                              "mkldnn::memory::dims{";
+                    if (window_dilation_strides_adjusted.size() > 1)
                     {
-                        writer << ", " << std::to_string(window_dilation_strides_adjusted[2]);
+                        for (auto i = 0; i < window_dilation_strides_adjusted.size() - 1; i++)
+                        {
+                            writer << std::to_string(window_dilation_strides_adjusted[i]) << ", ";
+                        }
                     }
+                    writer << std::to_string(
+                        window_dilation_strides_adjusted[window_dilation_strides_adjusted.size() -
+                                                         1]);
                     writer << "},\n"
-                              "mkldnn::memory::dims{"
-                           << std::to_string(pad_below[0]) << ", " << std::to_string(pad_below[1]);
-                    if (pad_below.size() == 3)
+                              "mkldnn::memory::dims{";
+                    if (pad_below.size() > 1)
                     {
-                        writer << ", " << std::to_string(pad_below[2]);
+                        for (auto i = 0; i < pad_below.size() - 1; i++)
+                        {
+                            writer << std::to_string(pad_below[i]) << ", ";
+                        }
                     }
+                    writer << std::to_string(pad_below[pad_below.size() - 1]);
                     writer << "},\n"
-                              "mkldnn::memory::dims{"
-                           << std::to_string(pad_above[0]) << ", " << std::to_string(pad_above[1]);
-                    if (pad_above.size() == 3)
+                              "mkldnn::memory::dims{";
+                    if (pad_above.size() > 1)
                     {
-                        writer << ", " << std::to_string(pad_above[2]);
+                        for (auto i = 0; i < pad_above.size() - 1; i++)
+                        {
+                            writer << std::to_string(pad_above[i]) << ", ";
+                        }
                     }
+                    writer << std::to_string(pad_above[pad_above.size() - 1]);
                     writer << "},\n"
                               "mkldnn::padding_kind::zero);\n";