IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix performance regression due to copying of opset (#4184)

Browse Source
This commit is contained in:
Maxim Vafin 2021-02-05 11:25:09 +03:00 committed by GitHub
parent e47186aad6
commit abf37e1caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inference-engine/src/readers/ir_reader/ie_ir_parser.cpp
View File

@ -693,7 +693,6 @@ std::shared_ptr<ngraph::Node> V10Parser::XmlDeserializer::createNode(
auto opsetIt = opsets.find(params.version); auto opsetIt = opsets.find(params.version);
// Try to create operation from loaded opsets // Try to create operation from loaded opsets
auto version = params.version;
static const std::unordered_set<std::string> experimental_detectrons = {"ExperimentalDetectronDetectionOutput", static const std::unordered_set<std::string> experimental_detectrons = {"ExperimentalDetectronDetectionOutput",
"ExperimentalDetectronGenerateProposalsSingleImage", "ExperimentalDetectronGenerateProposalsSingleImage",
"ExperimentalDetectronPriorGridGenerator", "ExperimentalDetectronPriorGridGenerator",
@ -701,11 +700,10 @@ std::shared_ptr<ngraph::Node> V10Parser::XmlDeserializer::createNode(
"ExperimentalDetectronTopKROIs"}; "ExperimentalDetectronTopKROIs"};
if (experimental_detectrons.count(params.type)) { if (experimental_detectrons.count(params.type)) {
version = "opset6"; opsetIt = opsets.find("opset6");
} }
if (!ngraphNode && opsets.count(version)) { if (!ngraphNode && opsetIt != opsets.end()) {
auto opset = opsets.at(version);
auto const & type = params.type == "Const" auto const & type = params.type == "Const"
? "Constant" ? "Constant"
: params.type; : params.type;
@ -718,10 +716,11 @@ std::shared_ptr<ngraph::Node> V10Parser::XmlDeserializer::createNode(
THROW_IE_EXCEPTION << "Cannot create " << params.type << " layer " << params.name << " id:" << params.layerId THROW_IE_EXCEPTION << "Cannot create " << params.type << " layer " << params.name << " id:" << params.layerId
<< " from unsupported opset: " << params.version; << " from unsupported opset: " << params.version;
} }
opset = opsetIt->second;
} }
} }
auto const& opset = opsetIt->second;
ngraphNode = std::shared_ptr<ngraph::Node>(opset.create_insensitive(type)); ngraphNode = std::shared_ptr<ngraph::Node>(opset.create_insensitive(type));
if (!ngraphNode) { if (!ngraphNode) {
THROW_IE_EXCEPTION << "Opset " << params.version << " doesn't contain the operation with type: " << type; THROW_IE_EXCEPTION << "Opset " << params.version << " doesn't contain the operation with type: " << type;