mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-30 00:34:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17887 from ilyachur:revert-17872-feature/ichuraev/1324

Browse Source
This commit is contained in:
Maksim Shabunin 2020-07-20 16:15:49 +00:00
commit 9d38a95292
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/dnn/src/ie_ngraph.cpp
View File

@ -380,11 +380,7 @@ void InfEngineNgraphNet::setNodePtr(std::shared_ptr<ngraph::Node>* ptr) {
void InfEngineNgraphNet::release() { void InfEngineNgraphNet::release() {
for (auto& node : components.back()) { for (auto& node : components.back()) {
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
if (!(ngraph::op::is_parameter(node) || ngraph::op::is_output(ngraph) || ngraph::op::is_constant(ngraph)) ) {
#else
if (!(node->is_parameter() || node->is_output() || node->is_constant()) ) { if (!(node->is_parameter() || node->is_output() || node->is_constant()) ) {
#endif
auto it = all_nodes.find(node->get_friendly_name()); auto it = all_nodes.find(node->get_friendly_name());
if (it != all_nodes.end()) { if (it != all_nodes.end()) {
unconnectedNodes.erase(*(it->second)); unconnectedNodes.erase(*(it->second));
@ -451,19 +447,11 @@ void InfEngineNgraphNet::createNet(Target targetId) {
ngraph::ResultVector outputs; ngraph::ResultVector outputs;
ngraph::ParameterVector inps; ngraph::ParameterVector inps;
for (auto& node : components.back()) { for (auto& node : components.back()) {
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
if (ngraph::op::is_parameter(node)) {
#else
if (node->is_parameter()) { if (node->is_parameter()) {
#endif
auto parameter = std::dynamic_pointer_cast<ngraph::op::Parameter>(node); auto parameter = std::dynamic_pointer_cast<ngraph::op::Parameter>(node);
inps.push_back(parameter); inps.push_back(parameter);
} }
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
else if (ngraph::op::is_output(node)) {
#else
else if (node->is_output()) { else if (node->is_output()) {
#endif
auto result = std::dynamic_pointer_cast<ngraph::op::Result>(node); auto result = std::dynamic_pointer_cast<ngraph::op::Result>(node);
outputs.push_back(result); outputs.push_back(result);
} }