diff --git a/modules/dnn/src/layers/convolution_layer.cpp b/modules/dnn/src/layers/convolution_layer.cpp index f0ca6585697c90baee13751ed0c65efa2ee9a315..7e7ce0418eb929eeb49d03501fc23cabb4cffc62 100644 --- a/modules/dnn/src/layers/convolution_layer.cpp +++ b/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; diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp index 128983c4993857315ed17520299aced5e0a46038..3af969d832a3e1f6823bbdfd66d1882b47f5d64a 100644 --- a/modules/dnn/src/tensorflow/tf_importer.cpp +++ b/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) diff --git a/modules/dnn/test/test_ie_models.cpp b/modules/dnn/test/test_ie_models.cpp index 77259d8b236733a6a3a4b30a5fe419ddae93f5b5..49262a5a320e6f73337b7018d1a7f329c8ed1a1b 100644 --- a/modules/dnn/test/test_ie_models.cpp +++ b/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