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

Revert "Eliminated invalid subgraphs (#2196)" (#2250)

Browse Source 
This reverts commit 89a6f926a4.
This commit is contained in:
Evgeny Talanin 2020-09-15 19:24:57 +03:00 committed by GitHub
parent 25ba600db1
commit 83238b23db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
docs/template_plugin/src/template_plugin.cpp
View File

@ -175,45 +175,11 @@ void Plugin::QueryNetwork(const ICNNNetwork &network, const ConfigMap& config, Q
}
// 4. The result set should contains just nodes from supported set
for (auto&& unsupportedNode : unsupported) {
supported.erase(unsupportedNode);
}
// 5. If some housekeeping nodes were not added add them.
for (auto&& node : function->get_ops()) {
if (contains(supported, node->get_friendly_name())) {
for (auto&& inputNodeOutput : node->input_values()) {
if (ngraph::op::is_constant(inputNodeOutput.get_node()) || ngraph::op::is_parameter(inputNodeOutput.get_node())) {
supported.emplace(inputNodeOutput.get_node()->get_friendly_name());
}
}
for (auto&& outputs : node->outputs()) {
for (auto&& outputNodeInput : outputs.get_target_inputs()) {
if (ngraph::op::is_output(outputNodeInput.get_node())) {
supported.emplace(outputNodeInput.get_node()->get_friendly_name());
}
}
}
}
}
// 6. Eliminate subgraphs that consists of housekeeping nodes only
for (auto&& node : function->get_ops()) {
if (ngraph::op::is_constant(node) || ngraph::op::is_parameter(node)) {
if (!contains(supported, node->output(0).get_target_inputs().begin()->get_node()->get_friendly_name())) {
supported.erase(node->get_friendly_name());
}
} else if (ngraph::op::is_output(node)) {
if (!contains(supported, node->input_values().begin()->get_node()->get_friendly_name())) {
supported.erase(node->get_friendly_name());
}
}
}
// 7. Produce the result
for (auto&& layerName : supported) {
if (!contains(unsupported, layerName)) {
res.supportedLayersMap.emplace(layerName, GetName());
}
}
}
// ! [plugin:query_network]

22
inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp
View File

@ -311,13 +311,11 @@ void Engine::QueryNetwork(const ICNNNetwork& network, const std::map<std::string
}
}
}
for (auto&& unsupportedNode : unsupported) {
supported.erase(unsupportedNode);
}
for (auto&& node : function->get_ops()) {
if (contains(supported, node->get_friendly_name())) {
if (!contains(unsupported, node->get_friendly_name())) {
for (auto&& inputNodeOutput : node->input_values()) {
if (ngraph::op::is_constant(inputNodeOutput.get_node()) || ngraph::op::is_parameter(inputNodeOutput.get_node())) {
if (ngraph::op::is_constant(inputNodeOutput.get_node())) {
supported.emplace(inputNodeOutput.get_node()->get_friendly_name());
}
}
@ -330,20 +328,12 @@ void Engine::QueryNetwork(const ICNNNetwork& network, const std::map<std::string
}
}
}
for (auto&& node : function->get_ops()) {
if (ngraph::op::is_constant(node) || ngraph::op::is_parameter(node)) {
if (!contains(supported, node->output(0).get_target_inputs().begin()->get_node()->get_friendly_name())) {
supported.erase(node->get_friendly_name());
}
} else if (ngraph::op::is_output(node)) {
if (!contains(supported, node->input_values().begin()->get_node()->get_friendly_name())) {
supported.erase(node->get_friendly_name());
}
}
}
for (auto&& layerName : supported) {
if (!contains(unsupported, layerName)) {
res.supportedLayersMap.emplace(layerName, GetName());
}
}
} else {
details::CNNNetworkIterator i(&network);
while (i != details::CNNNetworkIterator()) {