Fix python stuff on Scott's PR (#2843)

* Remove parameter, result, and node vector files and class, use vector

* Fix gcc issues

* style

* Remove python references

* update python files

* fix error

* fix build error

python/ngraph/impl/__init__.py

@@ -34,7 +34,6 @@ sys.setdlopenflags(flags)
 
 from _pyngraph import Function
 from _pyngraph import Node
-from _pyngraph import NodeVector
 from _pyngraph import Type
 from _pyngraph import Shape
 from _pyngraph import Strides

python/ngraph/ops.py

@@ -18,7 +18,7 @@
 import numpy as np
 
 from ngraph.impl import AxisSet, AxisVector, Coordinate, CoordinateDiff, Function, Node, \
-    NodeVector, Shape, Strides
+    Shape, Strides
 
 from ngraph.impl.op import Abs, Acos, Add, And, Asin, ArgMax, ArgMin, Atan, AvgPool, \
     BatchNormTraining, BatchNormInference, Broadcast, Ceiling, Concat, Constant, Convert, \
@@ -779,7 +779,7 @@ def concat(nodes, axis, name=None):  # type: (List[Node], int, str) -> Node
     :param name: The optional new name for output node.
     :return: Return new node that is a concatenation of input nodes.
     """
-    return Concat(NodeVector(nodes), axis)
+    return Concat(nodes, axis)
 
 
 @nameable_op

python/pyngraph/function.cpp

@@ -27,7 +27,7 @@ void regclass_pyngraph_Function(py::module m)
 {
     py::class_<ngraph::Function, std::shared_ptr<ngraph::Function>> function(m, "Function");
     function.doc() = "ngraph.impl.Function wraps ngraph::Function";
-    function.def(py::init<const ngraph::NodeVector&,
+    function.def(py::init<const std::vector<std::shared_ptr<ngraph::Node>>&,
                           const std::vector<std::shared_ptr<ngraph::op::Parameter>>&,
                           const std::string&>());
     function.def(py::init<const std::shared_ptr<ngraph::Node>&,

python/pyngraph/node_vector.cpp

-//*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//*****************************************************************************
-
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-#include "ngraph/node.hpp" // ngraph::Node
-#include "ngraph/node_vector.hpp"
-#include "pyngraph/node.hpp"
-#include "pyngraph/node_vector.hpp"
-
-namespace py = pybind11;
-
-void regclass_pyngraph_NodeVector(py::module m)
-{
-    py::class_<ngraph::NodeVector, std::shared_ptr<ngraph::NodeVector>> node_vector(m,
-                                                                                    "NodeVector");
-    node_vector.doc() = "ngraph.impl.NodeVector wraps ngraph::NodeVector";
-    node_vector.def(py::init<const std::initializer_list<std::shared_ptr<ngraph::Node>>&>());
-    node_vector.def(py::init<const std::vector<std::shared_ptr<ngraph::Node>>&>());
-    node_vector.def(py::init<const ngraph::NodeVector&>());
-}

python/pyngraph/node_vector.hpp

-//*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//*****************************************************************************
-
-#pragma once
-
-#include <pybind11/pybind11.h>
-
-namespace py = pybind11;
-
-void regclass_pyngraph_NodeVector(py::module m);

python/pyngraph/ops/concat.cpp

@@ -28,5 +28,5 @@ void regclass_pyngraph_op_Concat(py::module m)
     py::class_<ngraph::op::Concat, std::shared_ptr<ngraph::op::Concat>, ngraph::op::Op> concat(
         m, "Concat");
     concat.doc() = "ngraph.impl.op.Concat wraps ngraph::op::Concat";
-    concat.def(py::init<const ngraph::NodeVector&, size_t>());
+    concat.def(py::init<const std::vector<std::shared_ptr<ngraph::Node>>&, size_t>());
 }

python/pyngraph/ops/passthrough.cpp

@@ -30,6 +30,6 @@ void regclass_pyngraph_op_Passthrough(py::module m)
     pass.def(py::init<const std::string&,
                       const std::string&,
                       const std::string&,
-                      const ngraph::NodeVector&,
+                      const std::vector<std::shared_ptr<ngraph::Node>>&,
                       std::vector<std::tuple<ngraph::element::Type, ngraph::PartialShape>>>());
 }

python/pyngraph/parameter_vector.cpp

-//*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//*****************************************************************************
-
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-#include "ngraph/op/parameter.hpp" // ngraph::op::Parameter
-#include "ngraph/parameter_vector.hpp"
-#include "pyngraph/ops/parameter.hpp"
-#include "pyngraph/parameter_vector.hpp"
-
-namespace py = pybind11;
-
-void regclass_pyngraph_ParameterVector(py::module m)
-{
-    py::class_<ngraph::ParameterVector, std::shared_ptr<ngraph::ParameterVector>> parameter_vector(
-        m, "ParameterVector");
-    parameter_vector.doc() = "ngraph.impl.ParameterVector wraps ngraph::ParameterVector";
-    parameter_vector.def(
-        py::init<const std::initializer_list<std::shared_ptr<ngraph::op::Parameter>>&>());
-    parameter_vector.def(py::init<const std::vector<std::shared_ptr<ngraph::op::Parameter>>&>());
-    parameter_vector.def(py::init<const ngraph::ParameterVector&>());
-    parameter_vector.def("__len__", [](const ngraph::ParameterVector& v) { return v.size(); });
-    parameter_vector.def("__getitem__",
-                         [](const ngraph::ParameterVector& v, int key) { return v[key]; });
-    parameter_vector.def(
-        "__iter__",
-        [](ngraph::ParameterVector& v) { return py::make_iterator(v.begin(), v.end()); },
-        py::keep_alive<0, 1>()); /* Keep vector alive while iterator is used */
-}

python/pyngraph/parameter_vector.hpp

-//*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//*****************************************************************************
-
-#pragma once
-
-#include <pybind11/pybind11.h>
-
-namespace py = pybind11;
-
-void regclass_pyngraph_ParameterVector(py::module m);

python/pyngraph/pyngraph.cpp

@@ -21,16 +21,13 @@
 #include "pyngraph/coordinate_diff.hpp"
 #include "pyngraph/function.hpp"
 #include "pyngraph/node.hpp"
-#include "pyngraph/node_vector.hpp"
 #if defined(NGRAPH_ONNX_IMPORT_ENABLE)
 #include "pyngraph/onnx_import/onnx_import.hpp"
 #endif
 #include "pyngraph/ops/op.hpp"
 #include "pyngraph/ops/regmodule_pyngraph_op.hpp"
 #include "pyngraph/ops/util/regmodule_pyngraph_op_util.hpp"
-#include "pyngraph/parameter_vector.hpp"
 #include "pyngraph/passes/regmodule_pyngraph_passes.hpp"
-#include "pyngraph/result_vector.hpp"
 #include "pyngraph/runtime/regmodule_pyngraph_runtime.hpp"
 #include "pyngraph/serializer.hpp"
 #include "pyngraph/shape.hpp"
@@ -44,7 +41,6 @@ PYBIND11_MODULE(_pyngraph, m)
 {
     m.doc() = "Package ngraph.impl that wraps nGraph's namespace ngraph";
     regclass_pyngraph_Node(m);
-    regclass_pyngraph_NodeVector(m);
     regclass_pyngraph_Shape(m);
     regclass_pyngraph_Strides(m);
     regclass_pyngraph_CoordinateDiff(m);
@@ -54,7 +50,6 @@ PYBIND11_MODULE(_pyngraph, m)
     regmodule_pyngraph_types(m);
     regclass_pyngraph_Function(m);
     regclass_pyngraph_Serializer(m);
-    regclass_pyngraph_ParameterVector(m);
     py::module m_op = m.def_submodule("op", "Package ngraph.impl.op that wraps ngraph::op");
     regclass_pyngraph_op_Op(m_op);
 #if defined(NGRAPH_ONNX_IMPORT_ENABLE)
@@ -65,5 +60,4 @@ PYBIND11_MODULE(_pyngraph, m)
     regmodule_pyngraph_runtime(m);
     regmodule_pyngraph_passes(m);
     regmodule_pyngraph_util(m);
-    regclass_pyngraph_ResultVector(m);
 }

python/pyngraph/result_vector.cpp

-//*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//*****************************************************************************
-
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-#include "ngraph/op/result.hpp" // ngraph::op::Result
-#include "ngraph/result_vector.hpp"
-#include "pyngraph/ops/result.hpp"
-#include "pyngraph/result_vector.hpp"
-
-namespace py = pybind11;
-
-void regclass_pyngraph_ResultVector(py::module m)
-{
-    py::class_<ngraph::ResultVector, std::shared_ptr<ngraph::ResultVector>> result_vector(
-        m, "ResultVector");
-    result_vector.doc() = "ngraph.impl.ResultVector wraps ngraph::ResultVector";
-    result_vector.def(
-        py::init<const std::initializer_list<std::shared_ptr<ngraph::op::Result>>&>());
-    result_vector.def(py::init<const std::vector<std::shared_ptr<ngraph::op::Result>>&>());
-    result_vector.def(py::init<const ngraph::ResultVector&>());
-    result_vector.def("__len__", [](const ngraph::ResultVector& v) { return v.size(); });
-    result_vector.def("__getitem__", [](const ngraph::ResultVector& v, int key) { return v[key]; });
-    result_vector.def("__iter__",
-                      [](ngraph::ResultVector& v) { return py::make_iterator(v.begin(), v.end()); },
-                      py::keep_alive<0, 1>()); /* Keep vector alive while iterator is used */
-}

python/pyngraph/result_vector.hpp

-//*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//*****************************************************************************
-
-#pragma once
-
-#include <pybind11/pybind11.h>
-
-namespace py = pybind11;
-
-void regclass_pyngraph_ResultVector(py::module m);

python/setup.py

@@ -143,17 +143,14 @@ sources = [
     'pyngraph/function.cpp',
     'pyngraph/serializer.cpp',
     'pyngraph/node.cpp',
-    'pyngraph/node_vector.cpp',
     'pyngraph/shape.cpp',
     'pyngraph/strides.cpp',
     'pyngraph/coordinate_diff.cpp',
     'pyngraph/axis_set.cpp',
     'pyngraph/axis_vector.cpp',
     'pyngraph/coordinate.cpp',
-    'pyngraph/parameter_vector.cpp',
     'pyngraph/pyngraph.cpp',
     'pyngraph/util.cpp',
-    'pyngraph/result_vector.cpp',
     'pyngraph/ops/util/arithmetic_reduction.cpp',
     'pyngraph/ops/util/binary_elementwise_comparison.cpp',
     'pyngraph/ops/util/op_annotations.cpp',

src/ngraph/CMakeLists.txt

@@ -74,7 +74,6 @@ set (SRC
     ngraph_visibility.hpp
     node.cpp
     node.hpp
-    node_vector.hpp
     op/abs.cpp
     op/abs.hpp
     op/acos.cpp
@@ -301,7 +300,6 @@ set (SRC
     op/util/reshape.hpp
     op/util/unary_elementwise_arithmetic.cpp
     op/util/unary_elementwise_arithmetic.hpp
-    parameter_vector.hpp
     partial_shape.cpp
     partial_shape.hpp
     pass/algebraic_simplification.cpp
@@ -382,7 +380,6 @@ set (SRC
     provenance.cpp
     provenance.hpp
     rank.hpp
-    result_vector.hpp
     runtime/aligned_buffer.cpp
     runtime/aligned_buffer.hpp
     runtime/backend.cpp

src/ngraph/autodiff/adjoints.hpp

@@ -21,7 +21,6 @@
 #include <unordered_map>
 
 #include "ngraph/coordinate.hpp"
-#include "ngraph/node_vector.hpp"
 #include "ngraph/strides.hpp"
 
 namespace ngraph
@@ -29,11 +28,9 @@ namespace ngraph
     class Node;
     class Function;
 
-    namespace runtime
-    {
-        class Backend;
-        class Manager;
-    }
+    // Need duplicate definition here to avoid g++ issues
+    // Keep consistent with version in node.hpp
+    using NodeVector = std::vector<std::shared_ptr<Node>>;
 
     namespace autodiff
     {

src/ngraph/frontend/onnx_import/core/graph.hpp

@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "model.hpp"
-#include "ngraph/parameter_vector.hpp"
+#include "ngraph/op/parameter.hpp"
 #include "operator_set.hpp"
 #include "value_info.hpp"
 #include "weight.hpp"

src/ngraph/frontend/onnx_import/core/node.hpp

@@ -20,7 +20,7 @@
 #include <string>
 
 #include "ngraph/except.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace onnx
 {

src/ngraph/frontend/onnx_import/core/null_node.cpp

@@ -16,7 +16,6 @@
 
 #include "null_node.hpp"
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/core/null_node.hpp

@@ -19,7 +19,6 @@
 #include <memory>
 
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/core/operator_set.hpp

@@ -20,7 +20,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "node.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/core/value_info.hpp

@@ -19,7 +19,7 @@
 #include <onnx-ml.pb.h>
 
 #include "ngraph/op/constant.hpp"
-#include "ngraph/parameter_vector.hpp"
+#include "ngraph/op/parameter.hpp"
 #include "ngraph/shape.hpp"
 #include "ngraph/type/element_type.hpp"
 #include "node.hpp"

src/ngraph/frontend/onnx_import/op/abs.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/abs.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/acos.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/acos.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/acosh.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/add.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/add.hpp"
 #include "ngraph/op/util/broadcasting.hpp"
 

src/ngraph/frontend/onnx_import/op/and.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/and.hpp"
 #include "ngraph/op/util/broadcasting.hpp"
 

src/ngraph/frontend/onnx_import/op/argmax.cpp

@@ -16,7 +16,7 @@
 
 #include "ngraph/op/argmax.hpp"
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "utils/reduction.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/argmax.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/argmin.cpp

@@ -16,7 +16,7 @@
 
 #include "ngraph/op/argmin.hpp"
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "utils/reduction.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/argmin.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/asin.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/asin.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/asinh.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/atan.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/atan.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/atanh.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/average_pool.cpp

@@ -15,7 +15,6 @@
 //*****************************************************************************
 
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
 #include "ngraph/op/avg_pool.hpp"
 #include "utils/convpool.hpp"
 

src/ngraph/frontend/onnx_import/op/average_pool.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/batch_norm.cpp

@@ -20,7 +20,7 @@
 #include "ngraph/frontend/onnx_import/core/null_node.hpp"
 #include "ngraph/frontend/onnx_import/exceptions.hpp"
 #include "ngraph/frontend/onnx_import/op/batch_norm.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/batch_norm.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/cast.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/ceil.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/ceiling.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/clip.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/concat.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/constant.cpp

@@ -17,7 +17,7 @@
 #include "ngraph/op/constant.hpp"
 #include "core/node.hpp"
 #include "core/tensor.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/constant.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/conv.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/conv_transpose.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/cos.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/cos.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/cosh.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/cosh.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/depth_to_space.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/dequantize_linear.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/div.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/divide.hpp"
 #include "ngraph/op/util/broadcasting.hpp"
 

src/ngraph/frontend/onnx_import/op/dropout.hpp

@@ -20,7 +20,7 @@
 
 #include "core/node.hpp"
 #include "core/null_node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/elu.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/equal.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/equal.hpp"
 #include "ngraph/op/util/broadcasting.hpp"
 

src/ngraph/frontend/onnx_import/op/erf.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/erf.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/exp.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/exp.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/flatten.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/floor.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/floor.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/gather.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/gather.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/gemm.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/global_average_pool.cpp

@@ -15,7 +15,7 @@
 //*****************************************************************************
 
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/avg_pool.hpp"
 #include "utils/convpool.hpp"
 

src/ngraph/frontend/onnx_import/op/global_average_pool.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/global_max_pool.cpp

@@ -15,7 +15,7 @@
 //*****************************************************************************
 
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/max_pool.hpp"
 #include "utils/convpool.hpp"
 

src/ngraph/frontend/onnx_import/op/global_max_pool.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/greater.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/greater.hpp"
 #include "ngraph/op/util/broadcasting.hpp"
 

src/ngraph/frontend/onnx_import/op/hard_sigmoid.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/identity.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/leaky_relu.cpp

@@ -18,7 +18,7 @@
 
 #include "exceptions.hpp"
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/broadcast.hpp"
 #include "ngraph/op/constant.hpp"
 #include "ngraph/op/maximum.hpp"

src/ngraph/frontend/onnx_import/op/leaky_relu.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/less.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/less.hpp"
 #include "ngraph/op/util/broadcasting.hpp"
 

src/ngraph/frontend/onnx_import/op/log.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/log.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/log_softmax.hpp

@@ -21,7 +21,6 @@
 #include "core/node.hpp"
 #include "ngraph/frontend/onnx_import/op/softmax.hpp"
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
 #include "ngraph/op/log.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/lp_pool.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/lrn.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/lstm.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/matmul.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/max.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/maximum.hpp"
 #include "utils/variadic.hpp"
 

src/ngraph/frontend/onnx_import/op/max_pool.cpp

@@ -17,7 +17,6 @@
 #include "ngraph/op/max_pool.hpp"
 #include "core/null_node.hpp"
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
 #include "utils/convpool.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/max_pool.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/mean.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/min.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/minimum.hpp"
 #include "utils/variadic.hpp"
 

src/ngraph/frontend/onnx_import/op/mul.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/broadcast.hpp"
 #include "ngraph/op/multiply.hpp"
 #include "ngraph/op/util/broadcasting.hpp"

src/ngraph/frontend/onnx_import/op/neg.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/negative.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/not.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/not.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/onehot.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/or.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/or.hpp"
 #include "ngraph/op/util/broadcasting.hpp"
 

src/ngraph/frontend/onnx_import/op/pad.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "ngraph/frontend/onnx_import/core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/pow.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/power.hpp"
 #include "ngraph/op/util/broadcasting.hpp"
 

src/ngraph/frontend/onnx_import/op/prelu.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/quant_conv.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/quantize_linear.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/quantized_matmul.hpp

@@ -18,7 +18,7 @@
 
 #include "core/node.hpp"
 #include "ngraph/frontend/onnx_import/op/matmul.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/reciprocal.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/reduce.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/abs.hpp"
 #include "ngraph/op/exp.hpp"
 #include "ngraph/op/log.hpp"

src/ngraph/frontend/onnx_import/op/relu.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/relu.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/op/reshape.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/selu.cpp

@@ -19,7 +19,6 @@
 
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
-#include "ngraph/node_vector.hpp"
 #include "ngraph/op/add.hpp"
 #include "ngraph/op/broadcast.hpp"
 #include "ngraph/op/constant.hpp"

src/ngraph/frontend/onnx_import/op/selu.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/shape.hpp

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/sigmoid.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "core/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/op/sigmoid.hpp"
 
 namespace ngraph