Merge branch 'master' into jmenon/mkldnn-compile

src/ngraph/runtime/cpu/cpu_emitter.cpp

@@ -283,7 +283,7 @@ namespace ngraph
 
                 // define weights
                 writer << "std::vector<" << args[0].get_element_type().c_type_string()
-                       << ">bn_weights(2);\n";
+                       << ">bn_weights(2*" << input_shape[1] << ");\n";
                 auto weights_shape = Shape{2, input_shape[1]};
 
                 // push gamma and beta

test/backend_performance.cpp

@@ -155,13 +155,15 @@ TEST(benchmark, mxnet_seq2seq_backward)
 
 TEST(benchmark, mxnet_sockeye_seq2seq_forward)
 {
-    const string json_path = file_util::path_join(SERIALIZED_ZOO, "mxnet/Sockeye_Seq2Seq_forward.json");
+    const string json_path =
+        file_util::path_join(SERIALIZED_ZOO, "mxnet/Sockeye_Seq2Seq_forward.json");
     run_benchmark(json_path, "CPU", 10);
 }
 
 TEST(benchmark, mxnet_sockeye_seq2seq_backward)
 {
-    const string json_path = file_util::path_join(SERIALIZED_ZOO, "mxnet/Sockeye_Seq2Seq_backward.json");
+    const string json_path =
+        file_util::path_join(SERIALIZED_ZOO, "mxnet/Sockeye_Seq2Seq_backward.json");
     run_benchmark(json_path, "CPU", 10);
 }