Merge pull request #14225 from zuoshaobo:my3.4

This commit is contained in:
Alexander Alekhin 2019-04-02 09:57:26 +00:00
commit df1f62b34c

View File

@ -942,7 +942,7 @@ void TFImporter::populateNet(Net dstNet)
if (getDataLayout(name, data_layouts) == DATA_LAYOUT_UNKNOWN) if (getDataLayout(name, data_layouts) == DATA_LAYOUT_UNKNOWN)
data_layouts[name] = DATA_LAYOUT_NHWC; 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; bool haveConst = false;
for(int ii = 0; !haveConst && ii < layer.input_size(); ++ii) for(int ii = 0; !haveConst && ii < layer.input_size(); ++ii)