Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/dnn/src/layers/convolution_layer.cpp

@@ -676,7 +676,7 @@ public:
 
             int inpCnAll = input.size[1], width = input.size[3], height = input.size[2];
             int inpCn = inpCnAll / ngroups;
-            p.is1x1_ = kernel == Size(0,0) && pad == Size(0, 0);
+            p.is1x1_ = kernel == Size(1,1) && pad == Size(0, 0);
             p.useAVX = checkHardwareSupport(CPU_AVX);
             p.useAVX2 = checkHardwareSupport(CPU_AVX2);
             p.useAVX512 = CV_CPU_HAS_SUPPORT_AVX512_SKX;

modules/dnn/src/tensorflow/tf_importer.cpp

@@ -942,7 +942,7 @@ void TFImporter::populateNet(Net dstNet)
             if (getDataLayout(name, data_layouts) == DATA_LAYOUT_UNKNOWN)
                 data_layouts[name] = DATA_LAYOUT_NHWC;
         }
-        else if (type == "BiasAdd" || type == "Add" || type == "Sub")
+        else if (type == "BiasAdd" || type == "Add" || type == "Sub" || type=="AddN")
         {
             bool haveConst = false;
             for(int ii = 0; !haveConst && ii < layer.input_size(); ++ii)

modules/dnn/test/test_ie_models.cpp

@@ -178,12 +178,13 @@ TEST_P(DNNTestOpenVINO, models)
     Target target = (dnn::Target)(int)get<0>(GetParam());
     std::string modelName = get<1>(GetParam());
     std::string precision = (target == DNN_TARGET_OPENCL_FP16 || target == DNN_TARGET_MYRIAD) ? "FP16" : "FP32";
+    std::string prefix;
 
 #ifdef INF_ENGINE_RELEASE
 #if INF_ENGINE_RELEASE <= 2018050000
-    std::string prefix = utils::fs::join("intel_models",
-                         utils::fs::join(modelName,
-                         utils::fs::join(precision, modelName)));
+    prefix = utils::fs::join("intel_models",
+             utils::fs::join(modelName,
+             utils::fs::join(precision, modelName)));
 #endif
 #endif