third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the infinite loop in tf importer of 3.4 branch

Browse Source
This commit is contained in:
zihaomu 2022-11-15 11:42:10 +08:00
parent 2991717191
commit 5bf64e7dfe
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
View File

@ -829,12 +829,19 @@ void RemoveIdentityOps(tensorflow::GraphDef& net)
IdentityOpsMap::iterator it = identity_ops.find(input_op_name); IdentityOpsMap::iterator it = identity_ops.find(input_op_name);
if (it != identity_ops.end()) { if (it != identity_ops.end()) {
std::set<String> loopCheckSet;
// In case of Identity after Identity // In case of Identity after Identity
while (true) while (true)
{ {
IdentityOpsMap::iterator nextIt = identity_ops.find(it->second); IdentityOpsMap::iterator nextIt = identity_ops.find(it->second);
if (nextIt != identity_ops.end()) if (nextIt != identity_ops.end())
{
// Loop check
if (loopCheckSet.find(it->second) != loopCheckSet.end())
CV_Error(Error::StsError, "Found a loop in your input Tensorflow model, which is illegal!");
loopCheckSet.insert(it->second);
it = nextIt; it = nextIt;
}
else else
break; break;
} }