Merge pull request opencv#17894 from ilyachur:feature/ichuraev/remove_copy_with_new_args

mshabunin · mshabunin · commit b698d0a6ee12 · 2020-07-21T08:19:42.000Z
diff --git a/modules/dnn/src/ie_ngraph.cpp b/modules/dnn/src/ie_ngraph.cpp
@@ -109,6 +109,12 @@ class NgraphCustomOp: public ngraph::op::Op {
         }
     }
 
+#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_4)
+    std::shared_ptr<ngraph::Node> clone_with_new_inputs(const ngraph::OutputVector& new_args) const override
+    {
+        return std::make_shared<NgraphCustomOp>(new_args, params);
+    }
+#else
     std::shared_ptr<ngraph::Node> copy_with_new_args(const ngraph::NodeVector& new_args) const override
     {
 #if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_3)
@@ -117,6 +123,7 @@ class NgraphCustomOp: public ngraph::op::Op {
         return std::make_shared<NgraphCustomOp>(new_args, params);
 #endif
     }
+#endif
 
     bool visit_attributes(ngraph::AttributeVisitor& visitor) override
     {

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,12 @@ class NgraphCustomOp: public ngraph::op::Op {`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
	`112`	`+#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_4)`
	`113`	`+ std::shared_ptr<ngraph::Node> clone_with_new_inputs(const ngraph::OutputVector& new_args) const override`
	`114`	`+ {`
	`115`	`+ return std::make_shared<NgraphCustomOp>(new_args, params);`
	`116`	`+ }`
	`117`	`+#else`
`112`	`118`	`std::shared_ptr<ngraph::Node> copy_with_new_args(const ngraph::NodeVector& new_args) const override`
`113`	`119`	`{`
`114`	`120`	`#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_3)`
`@@ -117,6 +123,7 @@ class NgraphCustomOp: public ngraph::op::Op {`
`117`	`123`	`return std::make_shared<NgraphCustomOp>(new_args, params);`
`118`	`124`	`#endif`
`119`	`125`	`}`
	`126`	`+#endif`
`120`	`127`
`121`	`128`	`bool visit_attributes(ngraph::AttributeVisitor& visitor) override`
`122`	`129`	`{`