Merge pull request opencv#14225 from zuoshaobo:my3.4

alalek · alalek · commit df1f62b34cbd · 2019-04-02T09:57:26.000Z
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -942,7 +942,7 @@ void TFImporter::populateNet(Net dstNet)`
`942`	`942`	`if (getDataLayout(name, data_layouts) == DATA_LAYOUT_UNKNOWN)`
`943`	`943`	`data_layouts[name] = DATA_LAYOUT_NHWC;`
`944`	`944`	`}`
`945`		`- else if (type == "BiasAdd" \|\| type == "Add" \|\| type == "Sub")`
	`945`	`+ else if (type == "BiasAdd" \|\| type == "Add" \|\| type == "Sub" \|\| type=="AddN")`
`946`	`946`	`{`
`947`	`947`	`bool haveConst = false;`
`948`	`948`	`for(int ii = 0; !haveConst && ii < layer.input_size(); ++ii)`