Merge pull request #17080 from dkurt:dnn_ngraph_future

modules/dnn/src/ie_ngraph.cpp

@@ -77,7 +77,11 @@ public:
         return type_info;
     }
 
+#if INF_ENGINE_VER_MAJOR_GT(2020020000)
+    NgraphCustomOp(const ngraph::OutputVector& inputs,
+#else
     NgraphCustomOp(const ngraph::NodeVector& inputs,
+#endif
                    const std::map<std::string, InferenceEngine::Parameter>& params = {}):
         Op(inputs), params(params)
     {
@@ -103,7 +107,11 @@ public:
 
     std::shared_ptr<ngraph::Node> copy_with_new_args(const ngraph::NodeVector& new_args) const override
     {
+#if INF_ENGINE_VER_MAJOR_GT(2020020000)
+        return std::make_shared<NgraphCustomOp>(ngraph::as_output_vector(new_args), params);
+#else
         return std::make_shared<NgraphCustomOp>(new_args, params);
+#endif
     }
 
     bool visit_attributes(ngraph::AttributeVisitor& visitor) override
@@ -270,7 +278,11 @@ InfEngineNgraphNode::InfEngineNgraphNode(const std::vector<Ptr<BackendNode> >& n
         {"internals", shapesToStr(internals)}
     };
 
+#if INF_ENGINE_VER_MAJOR_GT(2020020000)
+    ngraph::OutputVector inp_nodes;
+#else
     ngraph::NodeVector inp_nodes;
+#endif
     for (const auto& node : nodes)
         inp_nodes.emplace_back(node.dynamicCast<InfEngineNgraphNode>()->node);
     node = std::make_shared<NgraphCustomOp>(inp_nodes, params);

modules/dnn/src/layers/blank_layer.cpp

@@ -139,7 +139,7 @@ public:
                                         const std::vector<Ptr<BackendNode> >& nodes) CV_OVERRIDE
     {
         auto& ieInpNode = nodes[0].dynamicCast<InfEngineNgraphNode>()->node;
-        ngraph::NodeVector inp{ieInpNode};
+        ngraph::OutputVector inp{ieInpNode};
         auto blank = std::make_shared<ngraph::op::Concat>(inp, 0);
         return Ptr<BackendNode>(new InfEngineNgraphNode(blank));
     }

modules/dnn/src/layers/concat_layer.cpp

@@ -323,7 +323,7 @@ public:
         std::vector<size_t> maxDims(numDims, 0);
 
         CV_Assert(inputs.size() == nodes.size());
-        ngraph::NodeVector inp_nodes;
+        ngraph::OutputVector inp_nodes;
         for (int i = 0; i < nodes.size(); ++i)
         {
             inp_nodes.push_back(nodes[i].dynamicCast<InfEngineNgraphNode>()->node);