[v0.1.0] Silee2/python binding (#674)

* Remove unsupported linker flags for Mac build.

* Restructure python binding.
Put low level direct wrapper for ngraph c++ API into ngraph/impl
Move high level API from ngraph_api to ngraph

* Move CMakeLists.txt to its own PR

doc/examples/onnx_example.py

@@ -21,10 +21,10 @@ onnx_protobuf = onnx.load('/path/to/model/cntk_ResNet20_CIFAR10/model.onnx')
 # Convert a serialized ONNX model to an ngraph model
 from ngraph_onnx.onnx_importer.importer import import_onnx_model
 ng_model = import_onnx_model(onnx_protobuf)[0]
- 
 
-# Using ngraph_api, create a callable computation object
-import ngraph_api as ng
+ 
+# Using an ngraph runtime (CPU backend), create a callable computation
+import ngraph as ng
 runtime = ng.runtime(manager_name='CPU')
 resnet = runtime.computation(ng_model['output'], *ng_model['inputs'])
  

python/README.md

@@ -44,7 +44,7 @@ pip install -r test_requirements.txt
 Then run a test.
 ```
 pytest test/test_ops.py
-pytest test/ngraph_api/*
+pytest test/ngraph/*
 ```
 
 ## Running tests with tox
@@ -70,7 +70,7 @@ You can run tests using only Python 3 or 2 using the `-e` (environment) switch:
 
 You can check styles in a particular code directory by specifying the path:
 
-    tox ngraph_api/
+    tox ngraph/
 
 In case of problems, try to recreate the virtual environments by deleting the `.tox` directory:
 

python/examples/basic.py

@@ -16,7 +16,7 @@
 """Usage example for the ngraph Pythonic API."""
 
 import numpy as np
-import ngraph_api as ng
+import ngraph as ng
 
 shape = [2, 2]
 A = ng.parameter(shape, name='A')

python/examples/mnist_mlp.py

@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ******************************************************************************
-from ngraph import Type, Function
-from ngraph import Node
-from ngraph.op import Parameter, Maximum, Reshape, Dot, Broadcast
-from ngraph.op import Constant, Exp, Log, Sum
-from ngraph.op import Greater, Convert, Reduce
-from ngraph.op import OneHot
+from ngraph.impl import Type, Function
+from ngraph.impl import Node, Shape, AxisVector, AxisSet
+from ngraph.impl.op import Parameter, Maximum, Reshape, Dot, Broadcast
+from ngraph.impl.op import Constant, Exp, Log, Sum
+from ngraph.impl.op import Greater, Convert, Reduce
+from ngraph.impl.op import OneHot
 
 from typing import List, Dict, Set
 
@@ -29,13 +29,13 @@ int_element_type = Type.i32
 bz = 53
 lr = 0.2
 
-Input = Parameter(float_element_type, [bz, 28, 28])
-Label = Parameter(int_element_type, [bz])
-LabelOneHot = Convert((OneHot(Label, [bz, 10], 1)), float_element_type)
+Input = Parameter(float_element_type, Shape([bz, 28, 28]))
+Label = Parameter(int_element_type, Shape([bz]))
+LabelOneHot = Convert((OneHot(Label, Shape([bz, 10]), 1)), float_element_type)
 
-MaxParam1 = Parameter(float_element_type, [])
-MaxParam2 = Parameter(float_element_type, [])
-MaxFn = Function([Maximum(MaxParam1, MaxParam2)],
+MaxParam1 = Parameter(float_element_type, Shape([]))
+MaxParam2 = Parameter(float_element_type, Shape([]))
+MaxFn = Function(Maximum(MaxParam1, MaxParam2),
                  [MaxParam1, MaxParam2],
                  'mnist')
 
@@ -44,10 +44,10 @@ def make_scalar_constant(elem_type, scalar, shape=None, axis_set=None):
     # type: (int, float, List[int], Set[int]) -> float
     """Create a Constant node for scalar value."""
     if shape is None:
-        shape = []
+        shape = Shape([])
     if axis_set is None:
-        axis_set = set()
-    scalar_shape = []  # type: List[int]
+        axis_set = AxisSet(set())
+    scalar_shape = Shape([])  # type: List[int]
     constant_op = Constant(elem_type, scalar_shape, [scalar])
     constant_broadcast = Broadcast(constant_op, shape, axis_set)
     return constant_broadcast
@@ -60,7 +60,7 @@ def make_float32_constant(scalar, shape=None, axis_set=None):
         shape = []
     if axis_set is None:
         axis_set = set()
-    return make_scalar_constant(Type.f32, scalar, shape, axis_set)
+    return make_scalar_constant(Type.f32, scalar, Shape(shape), AxisSet(axis_set))
 
 
 def make_float32_constant_like(scalar, op):  # type: (float, Node) -> float
@@ -69,7 +69,7 @@ def make_float32_constant_like(scalar, op):  # type: (float, Node) -> float
     shape = op.get_shape()
     for i in range(len(shape)):
         v.add(i)
-    return make_float32_constant(scalar, shape, v)
+    return make_float32_constant(scalar, Shape(shape), AxisSet(v))
 
 
 def transpose(op, order):  # type: (Node, List[int]) -> Node
@@ -78,7 +78,7 @@ def transpose(op, order):  # type: (Node, List[int]) -> Node
     for i in range(len(order)):
         v.append(op.get_shape()[order[i]])
     new_shape = v
-    return Reshape(op, order, new_shape)
+    return Reshape(op, AxisVector(order), Shape(new_shape))
 
 
 def relu(op):  # type: (Node) -> Node
@@ -87,45 +87,45 @@ def relu(op):  # type: (Node) -> Node
 
 
 # Flatten
-X1 = Reshape(Input, [0, 1, 2], [bz, 784])
+X1 = Reshape(Input, AxisVector([0, 1, 2]), Shape([bz, 784]))
 
 # Normalize
 X2 = X1 / make_float32_constant_like(255., X1)
 
 # Affine 1
-W1 = Parameter(float_element_type, [784, 100])
-b1 = Parameter(float_element_type, [100])
-X3 = Dot(X2, W1) + Broadcast(b1, [bz, 100], {0})
+W1 = Parameter(float_element_type, Shape([784, 100]))
+b1 = Parameter(float_element_type, Shape([100]))
+X3 = Dot(X2, W1) + Broadcast(b1, Shape([bz, 100]), AxisSet({0}))
 X4 = relu(X3)
 
 # Affine 2
-W2 = Parameter(float_element_type, [100, 10])
-b2 = Parameter(float_element_type, [10])
-X5 = Dot(X4, W2) + Broadcast(b2, [bz, 10], {0})
+W2 = Parameter(float_element_type, Shape([100, 10]))
+b2 = Parameter(float_element_type, Shape([10]))
+X5 = Dot(X4, W2) + Broadcast(b2, Shape([bz, 10]), AxisSet({0}))
 
 # Softmax
 Logits = X5
 Exp = Exp(Logits)
-Max = Reduce(Exp, make_float32_constant(0., [], set()), MaxFn, {1})
-MaxBroadcast = Broadcast(Max, [bz, 10], {1})
+Max = Reduce(Exp, make_float32_constant(0., [], set()), MaxFn, AxisSet({1}))
+MaxBroadcast = Broadcast(Max, Shape([bz, 10]), AxisSet({1}))
 Softmax = Exp / MaxBroadcast
 
 # Loss
 LogSoftmax = Log(Softmax)
-Loss = Sum(LogSoftmax * LabelOneHot, {0, 1}) / make_float32_constant(float(bz), [], set())
+Loss = Sum(LogSoftmax * LabelOneHot, AxisSet({0, 1})) / make_float32_constant(float(bz), [], set())
 
 # Derivatives
 dLogits = Softmax - LabelOneHot
 dX5 = dLogits
 
-dX4 = Dot(dX5, transpose(W2, [1, 0]))
-dW2 = Dot(transpose(X4, [1, 0]), dX5)
-db2 = Sum(dX5, {0})
+dX4 = Dot(dX5, transpose(W2, Shape([1, 0])))
+dW2 = Dot(transpose(X4, Shape([1, 0])), dX5)
+db2 = Sum(dX5, AxisSet({0}))
 
 dX3 = Convert((Greater(X3, make_float32_constant(0., [bz, 100], {0, 1}))), float_element_type) * dX4
-dX2 = Dot(dX3, transpose(W1, [1, 0]))
-dW1 = Dot(transpose(X2, [1, 0]), dX3)
-db1 = Sum(dX3, {0})
+dX2 = Dot(dX3, transpose(W1, Shape([1, 0])))
+dW1 = Dot(transpose(X2, Shape([1, 0])), dX3)
+db1 = Sum(dX3, AxisSet({0}))
 
 nW1 = W1 - make_float32_constant_like(lr, dW1) * dW1
 nb1 = b1 - make_float32_constant_like(lr, db1) * db1

python/ngraph/__init__.py

 # ******************************************************************************
-# Copyright 2017-2018 Intel Corporation
+# Copyright 2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,36 +13,43 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ******************************************************************************
-"""
-Package: ngraph
-Low level wrappers for the nGraph c++ api.
-"""
+"""ngraph module namespace, exposing factory functions for all ops and other classes."""
 
-# flake8: noqa
+from ngraph.ops import absolute
+from ngraph.ops import absolute as abs
+from ngraph.ops import add
+from ngraph.ops import avg_pool
+from ngraph.ops import broadcast
+from ngraph.ops import ceiling
+from ngraph.ops import ceiling as ceil
+from ngraph.ops import constant
+from ngraph.ops import convert
+from ngraph.ops import convolution
+from ngraph.ops import divide
+from ngraph.ops import dot
+from ngraph.ops import equal
+from ngraph.ops import exp
+from ngraph.ops import floor
+from ngraph.ops import greater
+from ngraph.ops import greater_eq
+from ngraph.ops import log
+from ngraph.ops import less
+from ngraph.ops import less_eq
+from ngraph.ops import logical_not
+from ngraph.ops import max
+from ngraph.ops import maximum
+from ngraph.ops import max_pool
+from ngraph.ops import min
+from ngraph.ops import minimum
+from ngraph.ops import multiply
+from ngraph.ops import negative
+from ngraph.ops import not_equal
+from ngraph.ops import parameter
+from ngraph.ops import prod
+from ngraph.ops import reshape
+from ngraph.ops import sqrt
+from ngraph.ops import subtract
+from ngraph.ops import sum
+from ngraph.ops import tanh
 
-import sys
-import six
-
-# workaround to load the libngraph.so with RTLD_GLOBAL
-if six.PY3:
-    import os
-    flags = os.RTLD_NOW | os.RTLD_GLOBAL
-else:
-    import ctypes
-    flags = sys.getdlopenflags() | ctypes.RTLD_GLOBAL
-sys.setdlopenflags(flags)
-
-from _pyngraph import Function
-from _pyngraph import Node
-from _pyngraph import NodeVector
-from _pyngraph import Type
-from _pyngraph import TensorViewType
-from _pyngraph import Shape
-from _pyngraph import Strides
-from _pyngraph import CoordinateDiff
-from _pyngraph import AxisSet
-from _pyngraph import AxisVector
-from _pyngraph import Coordinate
-
-from _pyngraph import serialize
-from _pyngraph import util
+from ngraph.runtime import runtime

python/ngraph/impl/__init__.py

+# ******************************************************************************
+# Copyright 2017-2018 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.
+# ******************************************************************************
+"""
+Package: ngraph
+Low level wrappers for the nGraph c++ api.
+"""
+
+# flake8: noqa
+
+import sys
+import six
+
+# workaround to load the libngraph.so with RTLD_GLOBAL
+if six.PY3:
+    import os
+    flags = os.RTLD_NOW | os.RTLD_GLOBAL
+else:
+    import ctypes
+    flags = sys.getdlopenflags() | ctypes.RTLD_GLOBAL
+sys.setdlopenflags(flags)
+
+from _pyngraph import Function
+from _pyngraph import Node
+from _pyngraph import NodeVector
+from _pyngraph import Type
+from _pyngraph import TensorViewType
+from _pyngraph import Shape
+from _pyngraph import Strides
+from _pyngraph import CoordinateDiff
+from _pyngraph import AxisSet
+from _pyngraph import AxisVector
+from _pyngraph import Coordinate
+
+from _pyngraph import serialize
+from _pyngraph import util

python/ngraph_api/ops.py → python/ngraph/ops.py

@@ -17,22 +17,22 @@
 """Factory functions for all ngraph ops."""
 import numpy as np
 
-from ngraph import AxisSet, AxisVector, CoordinateDiff, Node, Shape, Strides
+from ngraph.impl import AxisSet, AxisVector, CoordinateDiff, Node, Shape, Strides
 
-from ngraph.op import Abs, Add, AvgPool, Broadcast, Ceiling, Constant, Convert, Convolution, \
+from ngraph.impl.op import Abs, Add, AvgPool, Broadcast, Ceiling, Constant, Convert, Convolution, \
     Divide, Dot, Equal, Exp, Floor, Greater, GreaterEq, Less, LessEq, Log, Max, Maximum, MaxPool, \
     Min, Minimum, Multiply, Negative, Not, NotEqual, Parameter, Product, Reshape, Sqrt, Subtract, \
     Sum, Tanh
 
 from typing import Iterable, List, Optional
 
-from ngraph_api.utils.broadcasting import get_broadcast_axes
-from ngraph_api.utils.decorators import nameable_op, binary_op, unary_op
-from ngraph_api.utils.input_validation import assert_list_of_ints
-from ngraph_api.utils.reduction import get_reduction_axes
-from ngraph_api.utils.types import NumericType, NumericData, TensorShape, make_constant_node, \
+from ngraph.utils.broadcasting import get_broadcast_axes
+from ngraph.utils.decorators import nameable_op, binary_op, unary_op
+from ngraph.utils.input_validation import assert_list_of_ints
+from ngraph.utils.reduction import get_reduction_axes
+from ngraph.utils.types import NumericType, NumericData, TensorShape, make_constant_node, \
     as_node, NodeInput
-from ngraph_api.utils.types import get_element_type
+from ngraph.utils.types import get_element_type
 
 
 @nameable_op

python/ngraph_api/runtime.py → python/ngraph/runtime.py

@@ -19,11 +19,11 @@ from typing import List
 
 import numpy as np
 
-from ngraph import Function, Node, serialize, TensorViewType, util
-from ngraph.runtime import Manager
-from ngraph.op import Parameter
+from ngraph.impl import Function, Node, serialize, TensorViewType, util
+from ngraph.impl.runtime import Manager
+from ngraph.impl.op import Parameter
 
-from ngraph_api.utils.types import get_dtype, NumericData
+from ngraph.utils.types import get_dtype, NumericData
 
 log = logging.getLogger(__file__)
 
@@ -64,7 +64,7 @@ class Computation:
             shape = parameter.get_shape()
             element_type = parameter.get_element_type()
             self.tensor_views.append(runtime.backend.make_primary_tensor_view(element_type, shape))
-        self.function = Function(self.node, self.parameters, 'ngraph_API_computation')
+        self.function = Function(self.node, self.parameters, 'ngraph_computation')
 
     def __repr__(self):  # type: () -> str
         params_string = ', '.join([param.name for param in self.parameters])

python/ngraph_api/utils/broadcasting.py → python/ngraph/utils/broadcasting.py

@@ -16,10 +16,10 @@
 import logging
 from typing import Optional, List
 
-import ngraph_api as ng
+import ngraph as ng
 
-from ngraph import AxisSet, Node
-from ngraph_api.utils.types import TensorShape, get_dtype, make_constant_node, NodeInput
+from ngraph.impl import AxisSet, Node
+from ngraph.utils.types import TensorShape, get_dtype, make_constant_node, NodeInput
 
 log = logging.getLogger(__file__)
 

python/ngraph_api/utils/decorators.py → python/ngraph/utils/decorators.py

@@ -16,9 +16,9 @@
 from functools import wraps
 from typing import Any, Callable
 
-from ngraph import Node
-from ngraph_api.utils.types import as_node, NodeInput
-from ngraph_api.utils.broadcasting import as_elementwise_compatible_nodes
+from ngraph.impl import Node
+from ngraph.utils.types import as_node, NodeInput
+from ngraph.utils.broadcasting import as_elementwise_compatible_nodes
 
 
 def _set_node_name(node, **kwargs):  # type: (Node, **Any) -> Node

python/ngraph_api/utils/input_validation.py → python/ngraph/utils/input_validation.py

@@ -19,7 +19,7 @@
 import logging
 from typing import Iterable
 
-from ngraph_api.exceptions import UserInputError
+from ngraph.exceptions import UserInputError
 
 log = logging.getLogger(__file__)
 

python/ngraph_api/utils/reduction.py → python/ngraph/utils/reduction.py

@@ -15,7 +15,7 @@
 # ******************************************************************************
 
 from typing import Iterable, Optional
-from ngraph import Node
+from ngraph.impl import Node
 
 
 def get_reduction_axes(node, reduction_axes):

python/ngraph_api/utils/types.py → python/ngraph/utils/types.py

@@ -20,11 +20,11 @@ from typing import Union, List
 
 import numpy as np
 
-from ngraph import Type as NgraphType
-from ngraph import Node, Shape
-from ngraph.op import Constant
+from ngraph.impl import Type as NgraphType
+from ngraph.impl import Node, Shape
+from ngraph.impl.op import Constant
 
-from ngraph_api.exceptions import NgraphTypeError
+from ngraph.exceptions import NgraphTypeError
 
 
 log = logging.getLogger(__file__)

python/ngraph_api/__init__.py

-# ******************************************************************************
-# Copyright 2018 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.
-# ******************************************************************************
-"""ngraph module namespace, exposing factory functions for all ops and other classes."""
-
-from ngraph_api.ops import absolute
-from ngraph_api.ops import absolute as abs
-from ngraph_api.ops import add
-from ngraph_api.ops import avg_pool
-from ngraph_api.ops import broadcast
-from ngraph_api.ops import ceiling
-from ngraph_api.ops import ceiling as ceil
-from ngraph_api.ops import constant
-from ngraph_api.ops import convert
-from ngraph_api.ops import convolution
-from ngraph_api.ops import divide
-from ngraph_api.ops import dot
-from ngraph_api.ops import equal
-from ngraph_api.ops import exp
-from ngraph_api.ops import floor
-from ngraph_api.ops import greater
-from ngraph_api.ops import greater_eq
-from ngraph_api.ops import log
-from ngraph_api.ops import less
-from ngraph_api.ops import less_eq
-from ngraph_api.ops import logical_not
-from ngraph_api.ops import max
-from ngraph_api.ops import maximum
-from ngraph_api.ops import max_pool
-from ngraph_api.ops import min
-from ngraph_api.ops import minimum
-from ngraph_api.ops import multiply
-from ngraph_api.ops import negative
-from ngraph_api.ops import not_equal
-from ngraph_api.ops import parameter
-from ngraph_api.ops import prod
-from ngraph_api.ops import reshape
-from ngraph_api.ops import sqrt
-from ngraph_api.ops import subtract
-from ngraph_api.ops import sum
-from ngraph_api.ops import tanh
-
-from ngraph_api.runtime import runtime

python/pyngraph/axis_set.cpp

@@ -24,7 +24,7 @@ namespace py = pybind11;
 void regclass_pyngraph_AxisSet(py::module m)
 {
     py::class_<ngraph::AxisSet, std::shared_ptr<ngraph::AxisSet>> axis_set(m, "AxisSet");
-    axis_set.doc() = "ngraph.AxisSet wraps ngraph::AxisSet";
+    axis_set.doc() = "ngraph.impl.AxisSet wraps ngraph::AxisSet";
     axis_set.def(py::init<const std::initializer_list<size_t>&>());
     axis_set.def(py::init<const std::set<size_t>&>());
     axis_set.def(py::init<const ngraph::AxisSet&>());

python/pyngraph/axis_vector.cpp

@@ -25,7 +25,7 @@ void regclass_pyngraph_AxisVector(py::module m)
 {
     py::class_<ngraph::AxisVector, std::shared_ptr<ngraph::AxisVector>> axis_vector(m,
                                                                                     "AxisVector");
-    axis_vector.doc() = "ngraph.AxisVector wraps ngraph::AxisVector";
+    axis_vector.doc() = "ngraph.impl.AxisVector wraps ngraph::AxisVector";
     axis_vector.def(py::init<const std::initializer_list<size_t>&>());
     axis_vector.def(py::init<const std::vector<size_t>&>());
     axis_vector.def(py::init<const ngraph::AxisVector&>());

python/pyngraph/coordinate.cpp

@@ -24,7 +24,7 @@ namespace py = pybind11;
 void regclass_pyngraph_Coordinate(py::module m)
 {
     py::class_<ngraph::Coordinate, std::shared_ptr<ngraph::Coordinate>> coordinate(m, "Coordinate");
-    coordinate.doc() = "ngraph.Coordinate wraps ngraph::Coordinate";
+    coordinate.doc() = "ngraph.impl.Coordinate wraps ngraph::Coordinate";
     coordinate.def(py::init<const std::initializer_list<size_t>&>());
     coordinate.def(py::init<const ngraph::Shape&>());
     coordinate.def(py::init<const std::vector<size_t>&>());

python/pyngraph/coordinate_diff.cpp

@@ -25,7 +25,7 @@ void regclass_pyngraph_CoordinateDiff(py::module m)
 {
     py::class_<ngraph::CoordinateDiff, std::shared_ptr<ngraph::CoordinateDiff>> coordinate_diff(
         m, "CoordinateDiff");
-    coordinate_diff.doc() = "ngraph.CoordinateDiff wraps ngraph::CoordinateDiff";
+    coordinate_diff.doc() = "ngraph.impl.CoordinateDiff wraps ngraph::CoordinateDiff";
     coordinate_diff.def(py::init<const std::initializer_list<ptrdiff_t>&>());
     coordinate_diff.def(py::init<const std::vector<ptrdiff_t>&>());
     coordinate_diff.def(py::init<const ngraph::CoordinateDiff&>());

python/pyngraph/function.cpp

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

python/pyngraph/node.cpp

@@ -29,7 +29,7 @@ namespace py = pybind11;
 void regclass_pyngraph_Node(py::module m)
 {
     py::class_<ngraph::Node, std::shared_ptr<ngraph::Node>> node(m, "Node");
-    node.doc() = "ngraph.Node wraps ngraph::Node";
+    node.doc() = "ngraph.impl.Node wraps ngraph::Node";
     node.def("__add__",
              [](const std::shared_ptr<ngraph::Node>& a, const std::shared_ptr<ngraph::Node> b) {
                  return a + b;

python/pyngraph/node_vector.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_NodeVector(py::module m)
 {
     py::class_<ngraph::NodeVector, std::shared_ptr<ngraph::NodeVector>> node_vector(m,
                                                                                     "NodeVector");
-    node_vector.doc() = "ngraph.NodeVector wraps ngraph::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/ops/abs.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Abs(py::module m)
                std::shared_ptr<ngraph::op::Abs>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         abs(m, "Abs");
-    abs.doc() = "ngraph.op.Abs wraps ngraph::op::Abs";
+    abs.doc() = "ngraph.impl.op.Abs wraps ngraph::op::Abs";
     abs.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/acos.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Acos(py::module m)
                std::shared_ptr<ngraph::op::Acos>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         acos(m, "Acos");
-    acos.doc() = "ngraph.op.Acos wraps ngraph::op::Acos";
+    acos.doc() = "ngraph.impl.op.Acos wraps ngraph::op::Acos";
     acos.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/add.cpp

@@ -28,6 +28,6 @@ void regclass_pyngraph_op_Add(py::module m)
                std::shared_ptr<ngraph::op::Add>,
                ngraph::op::util::BinaryElementwiseArithmetic>
         add(m, "Add");
-    add.doc() = "ngraph.op.Add wraps ngraph::op::Add";
+    add.doc() = "ngraph.impl.op.Add wraps ngraph::op::Add";
     add.def(py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/allreduce.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_AllReduce(py::module m)
                std::shared_ptr<ngraph::op::AllReduce>,
                ngraph::op::util::RequiresTensorViewArgs>
         allreduce(m, "AllReduce");
-    allreduce.doc() = "ngraph.op.AllReduce wraps ngraph::op::AllReduce";
+    allreduce.doc() = "ngraph.impl.op.AllReduce wraps ngraph::op::AllReduce";
     allreduce.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/asin.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Asin(py::module m)
                std::shared_ptr<ngraph::op::Asin>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         asin(m, "Asin");
-    asin.doc() = "ngraph.op.Asin wraps ngraph::op::Asin";
+    asin.doc() = "ngraph.impl.op.Asin wraps ngraph::op::Asin";
     asin.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/atan.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Atan(py::module m)
                std::shared_ptr<ngraph::op::Atan>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         atan(m, "Atan");
-    atan.doc() = "ngraph.op.Atan wraps ngraph::op::Atan";
+    atan.doc() = "ngraph.impl.op.Atan wraps ngraph::op::Atan";
     atan.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/avg_pool.cpp

@@ -29,7 +29,7 @@ void regclass_pyngraph_op_AvgPool(py::module m)
                std::shared_ptr<ngraph::op::AvgPool>,
                ngraph::op::util::RequiresTensorViewArgs>
         avg_pool(m, "AvgPool");
-    avg_pool.doc() = "ngraph.op.AvgPool wraps ngraph::op::AvgPool";
+    avg_pool.doc() = "ngraph.impl.op.AvgPool wraps ngraph::op::AvgPool";
     avg_pool.def(py::init<const std::shared_ptr<ngraph::Node>&,
                           const ngraph::Shape&,
                           const ngraph::Strides&,
@@ -48,7 +48,7 @@ void regclass_pyngraph_op_AvgPoolBackprop(py::module m)
                std::shared_ptr<ngraph::op::AvgPoolBackprop>,
                ngraph::op::util::RequiresTensorViewArgs>
         avg_pool_backprop(m, "AvgPoolBackprop");
-    avg_pool_backprop.doc() = "ngraph.op.AvgPoolBackprop wraps ngraph::op::AvgPoolBackprop";
+    avg_pool_backprop.doc() = "ngraph.impl.op.AvgPoolBackprop wraps ngraph::op::AvgPoolBackprop";
     avg_pool_backprop.def(py::init<const ngraph::Shape&,
                                    const std::shared_ptr<ngraph::Node>&,
                                    const ngraph::Shape&,

python/pyngraph/ops/batch_norm.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_BatchNorm(py::module m)
                std::shared_ptr<ngraph::op::BatchNorm>,
                ngraph::op::util::RequiresTensorViewArgs>
         batch_norm(m, "BatchNorm");
-    batch_norm.doc() = "ngraph.op.BatchNorm wraps ngraph::op::BatchNorm";
+    batch_norm.doc() = "ngraph.impl.op.BatchNorm wraps ngraph::op::BatchNorm";
     batch_norm.def(py::init<double,
                             const std::shared_ptr<ngraph::Node>&,
                             const std::shared_ptr<ngraph::Node>&,
@@ -41,7 +41,7 @@ void regclass_pyngraph_op_BatchNormBackprop(py::module m)
                std::shared_ptr<ngraph::op::BatchNormBackprop>,
                ngraph::op::util::RequiresTensorViewArgs>
         batch_norm_backprop(m, "BatchNormBackprop");
-    batch_norm_backprop.doc() = "ngraph.op.BatchNormBackprop wraps ngraph::op::BatchNormBackprop";
+    batch_norm_backprop.doc() = "ngraph.impl.op.BatchNormBackprop wraps ngraph::op::BatchNormBackprop";
     batch_norm_backprop.def(py::init<double,
                                      const std::shared_ptr<ngraph::Node>&,
                                      const std::shared_ptr<ngraph::Node>&,

python/pyngraph/ops/broadcast.cpp

@@ -29,7 +29,7 @@ void regclass_pyngraph_op_Broadcast(py::module m)
                std::shared_ptr<ngraph::op::Broadcast>,
                ngraph::op::util::RequiresTensorViewArgs>
         broadcast(m, "Broadcast");
-    broadcast.doc() = "ngraph.op.Broadcast wraps ngraph::op::Broadcast";
+    broadcast.doc() = "ngraph.impl.op.Broadcast wraps ngraph::op::Broadcast";
     broadcast.def(py::init<const std::shared_ptr<ngraph::Node>&,
                            const ngraph::Shape&,
                            const ngraph::AxisSet&>());

python/pyngraph/ops/ceiling.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Ceiling(py::module m)
                std::shared_ptr<ngraph::op::Ceiling>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         ceiling(m, "Ceiling");
-    ceiling.doc() = "ngraph.op.Ceiling wraps ngraph::op::Ceiling";
+    ceiling.doc() = "ngraph.impl.op.Ceiling wraps ngraph::op::Ceiling";
     ceiling.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/concat.cpp

@@ -29,6 +29,6 @@ void regclass_pyngraph_op_Concat(py::module m)
                std::shared_ptr<ngraph::op::Concat>,
                ngraph::op::util::RequiresTensorViewArgs>
         concat(m, "Concat");
-    concat.doc() = "ngraph.op.Concat wraps ngraph::op::Concat";
+    concat.doc() = "ngraph.impl.op.Concat wraps ngraph::op::Concat";
     concat.def(py::init<const ngraph::NodeVector&, size_t>());
 }

python/pyngraph/ops/constant.cpp

@@ -26,7 +26,7 @@ void regclass_pyngraph_op_Constant(py::module m)
 {
     py::class_<ngraph::op::Constant, std::shared_ptr<ngraph::op::Constant>, ngraph::Node> constant(
         m, "Constant");
-    constant.doc() = "ngraph.op.Constant wraps ngraph::op::Constant";
+    constant.doc() = "ngraph.impl.op.Constant wraps ngraph::op::Constant";
     constant.def(
         py::init<const ngraph::element::Type&, const ngraph::Shape&, const std::vector<char>&>());
     constant.def(

python/pyngraph/ops/convert.cpp

@@ -28,6 +28,6 @@ void regclass_pyngraph_op_Convert(py::module m)
                std::shared_ptr<ngraph::op::Convert>,
                ngraph::op::util::UnaryElementwise>
         convert(m, "Convert");
-    convert.doc() = "ngraph.op.Convert wraps ngraph::op::Convert";
+    convert.doc() = "ngraph.impl.op.Convert wraps ngraph::op::Convert";
     convert.def(py::init<const std::shared_ptr<ngraph::Node>&, const ngraph::element::Type&>());
 }

python/pyngraph/ops/convolution.cpp

@@ -29,7 +29,7 @@ void regclass_pyngraph_op_Convolution(py::module m)
                std::shared_ptr<ngraph::op::Convolution>,
                ngraph::op::util::RequiresTensorViewArgs>
         convolution(m, "Convolution");
-    convolution.doc() = "ngraph.op.Convolution wraps ngraph::op::Convolution";
+    convolution.doc() = "ngraph.impl.op.Convolution wraps ngraph::op::Convolution";
     convolution.def(py::init<const std::shared_ptr<ngraph::Node>&,
                              const std::shared_ptr<ngraph::Node>&,
                              const ngraph::Strides&,

python/pyngraph/ops/cos.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Cos(py::module m)
                std::shared_ptr<ngraph::op::Cos>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         cos(m, "Cos");
-    cos.doc() = "ngraph.op.Cos wraps ngraph::op::Cos";
+    cos.doc() = "ngraph.impl.op.Cos wraps ngraph::op::Cos";
     cos.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/cosh.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Cosh(py::module m)
                std::shared_ptr<ngraph::op::Cosh>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         cosh(m, "Cosh");
-    cosh.doc() = "ngraph.op.Cosh wraps ngraph::op::Cosh";
+    cosh.doc() = "ngraph.impl.op.Cosh wraps ngraph::op::Cosh";
     cosh.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/divide.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Divide(py::module m)
                std::shared_ptr<ngraph::op::Divide>,
                ngraph::op::util::BinaryElementwiseArithmetic>
         divide(m, "Divide");
-    divide.doc() = "ngraph.op.Divide wraps ngraph::op::Divide";
+    divide.doc() = "ngraph.impl.op.Divide wraps ngraph::op::Divide";
     divide.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/dot.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Dot(py::module m)
                std::shared_ptr<ngraph::op::Dot>,
                ngraph::op::util::RequiresTensorViewArgs>
         dot(m, "Dot");
-    dot.doc() = "ngraph.op.Dot wraps ngraph::op::Dot";
+    dot.doc() = "ngraph.impl.op.Dot wraps ngraph::op::Dot";
     dot.def(py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
     dot.def(py::init<const std::shared_ptr<ngraph::Node>&,
                      const std::shared_ptr<ngraph::Node>&,

python/pyngraph/ops/equal.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Equal(py::module m)
                std::shared_ptr<ngraph::op::Equal>,
                ngraph::op::util::BinaryElementwiseComparison>
         equal(m, "Equal");
-    equal.doc() = "ngraph.op.Equal wraps ngraph::op::Equal";
+    equal.doc() = "ngraph.impl.op.Equal wraps ngraph::op::Equal";
     equal.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/exp.cpp

@@ -28,6 +28,6 @@ void regclass_pyngraph_op_Exp(py::module m)
                std::shared_ptr<ngraph::op::Exp>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         exp(m, "Exp");
-    exp.doc() = "ngraph.op.Exp wraps ngraph::op::Exp";
+    exp.doc() = "ngraph.impl.op.Exp wraps ngraph::op::Exp";
     exp.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/floor.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Floor(py::module m)
                std::shared_ptr<ngraph::op::Floor>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         floor(m, "Floor");
-    floor.doc() = "ngraph.op.Floor wraps ngraph::op::Floor";
+    floor.doc() = "ngraph.impl.op.Floor wraps ngraph::op::Floor";
     floor.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/function_call.cpp

@@ -26,6 +26,6 @@ void regclass_pyngraph_op_FunctionCall(py::module m)
 {
     py::class_<ngraph::op::FunctionCall, std::shared_ptr<ngraph::op::FunctionCall>, ngraph::Node>
         function_call(m, "FunctionCall");
-    function_call.doc() = "ngraph.op.FunctionCall wraps ngraph::op::FunctionCall";
+    function_call.doc() = "ngraph.impl.op.FunctionCall wraps ngraph::op::FunctionCall";
     function_call.def(py::init<std::shared_ptr<ngraph::Function>, const ngraph::NodeVector&>());
 }

python/pyngraph/ops/get_output_element.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_GetOutputElement(py::module m)
                std::shared_ptr<ngraph::op::GetOutputElement>,
                ngraph::Node>
         get_output_element(m, "GetOutputElement");
-    get_output_element.doc() = "ngraph.op.GetOutputElement wraps ngraph::op::GetOutputElement";
+    get_output_element.doc() = "ngraph.impl.op.GetOutputElement wraps ngraph::op::GetOutputElement";
     get_output_element.def(py::init<const std::shared_ptr<ngraph::Node>&, size_t>());
 }

python/pyngraph/ops/greater.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Greater(py::module m)
                std::shared_ptr<ngraph::op::Greater>,
                ngraph::op::util::BinaryElementwiseComparison>
         greater(m, "Greater");
-    greater.doc() = "ngraph.op.Greater wraps ngraph::op::Greater";
+    greater.doc() = "ngraph.impl.op.Greater wraps ngraph::op::Greater";
     greater.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/greater_eq.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_GreaterEq(py::module m)
                std::shared_ptr<ngraph::op::GreaterEq>,
                ngraph::op::util::BinaryElementwiseComparison>
         greater_eq(m, "GreaterEq");
-    greater_eq.doc() = "ngraph.op.GreaterEq wraps ngraph::op::GreaterEq";
+    greater_eq.doc() = "ngraph.impl.op.GreaterEq wraps ngraph::op::GreaterEq";
     greater_eq.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/less.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Less(py::module m)
                std::shared_ptr<ngraph::op::Less>,
                ngraph::op::util::BinaryElementwiseComparison>
         less(m, "Less");
-    less.doc() = "ngraph.op.Less wraps ngraph::op::Less";
+    less.doc() = "ngraph.impl.op.Less wraps ngraph::op::Less";
     less.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/less_eq.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_LessEq(py::module m)
                std::shared_ptr<ngraph::op::LessEq>,
                ngraph::op::util::BinaryElementwiseComparison>
         less_eq(m, "LessEq");
-    less_eq.doc() = "ngraph.op.LessEq wraps ngraph::op::LessEq";
+    less_eq.doc() = "ngraph.impl.op.LessEq wraps ngraph::op::LessEq";
     less_eq.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/log.cpp

@@ -28,6 +28,6 @@ void regclass_pyngraph_op_Log(py::module m)
                std::shared_ptr<ngraph::op::Log>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         log(m, "Log");
-    log.doc() = "ngraph.op.Log wraps ngraph::op::Log";
+    log.doc() = "ngraph.impl.op.Log wraps ngraph::op::Log";
     log.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/max.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Max(py::module m)
                std::shared_ptr<ngraph::op::Max>,
                ngraph::op::util::ArithmeticReduction>
         max(m, "Max");
-    max.doc() = "ngraph.op.Max wraps ngraph::op::Max";
+    max.doc() = "ngraph.impl.op.Max wraps ngraph::op::Max";
     max.def(py::init<const std::shared_ptr<ngraph::Node>&, const ngraph::AxisSet&>());
 }

python/pyngraph/ops/max_pool.cpp

@@ -46,7 +46,7 @@ void regclass_pyngraph_op_MaxPoolBackprop(py::module m)
                std::shared_ptr<ngraph::op::MaxPoolBackprop>,
                ngraph::op::util::RequiresTensorViewArgs>
         max_pool_backprop(m, "MaxPoolBackprop");
-    max_pool_backprop.doc() = "ngraph.op.MaxPoolBackprop wraps ngraph::op::MaxPoolBackprop";
+    max_pool_backprop.doc() = "ngraph.impl.op.MaxPoolBackprop wraps ngraph::op::MaxPoolBackprop";
     max_pool_backprop.def(py::init<const std::shared_ptr<ngraph::Node>&,
                                    const std::shared_ptr<ngraph::Node>&,
                                    const ngraph::Shape&,

python/pyngraph/ops/maximum.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Maximum(py::module m)
                std::shared_ptr<ngraph::op::Maximum>,
                ngraph::op::util::BinaryElementwiseArithmetic>
         maximum(m, "Maximum");
-    maximum.doc() = "ngraph.op.Maximum wraps ngraph::op::Maximum";
+    maximum.doc() = "ngraph.impl.op.Maximum wraps ngraph::op::Maximum";
     maximum.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/min.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Min(py::module m)
                std::shared_ptr<ngraph::op::Min>,
                ngraph::op::util::ArithmeticReduction>
         min(m, "Min");
-    min.doc() = "ngraph.op.Min wraps ngraph::op::Min";
+    min.doc() = "ngraph.impl.op.Min wraps ngraph::op::Min";
     min.def(py::init<const std::shared_ptr<ngraph::Node>&, const ngraph::AxisSet&>());
 }

python/pyngraph/ops/minimum.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Minimum(py::module m)
                std::shared_ptr<ngraph::op::Minimum>,
                ngraph::op::util::BinaryElementwiseArithmetic>
         minimum(m, "Minimum");
-    minimum.doc() = "ngraph.op.Minimum wraps ngraph::op::Minimum";
+    minimum.doc() = "ngraph.impl.op.Minimum wraps ngraph::op::Minimum";
     minimum.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/multiply.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Multiply(py::module m)
                std::shared_ptr<ngraph::op::Multiply>,
                ngraph::op::util::BinaryElementwiseArithmetic>
         multiply(m, "Multiply");
-    multiply.doc() = "ngraph.op.Multiply wraps ngraph::op::Multiply";
+    multiply.doc() = "ngraph.impl.op.Multiply wraps ngraph::op::Multiply";
     multiply.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/negative.cpp

@@ -28,6 +28,6 @@ void regclass_pyngraph_op_Negative(py::module m)
                std::shared_ptr<ngraph::op::Negative>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         negative(m, "Negative");
-    negative.doc() = "ngraph.op.Negative wraps ngraph::op::Negative";
+    negative.doc() = "ngraph.impl.op.Negative wraps ngraph::op::Negative";
     negative.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/not.cpp

@@ -28,6 +28,6 @@ void regclass_pyngraph_op_Not(py::module m)
                std::shared_ptr<ngraph::op::Not>,
                ngraph::op::util::UnaryElementwise>
         logical_not(m, "Not");
-    logical_not.doc() = "ngraph.op.Not wraps ngraph::op::Not";
+    logical_not.doc() = "ngraph.impl.op.Not wraps ngraph::op::Not";
     logical_not.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/not_equal.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_NotEqual(py::module m)
                std::shared_ptr<ngraph::op::NotEqual>,
                ngraph::op::util::BinaryElementwiseComparison>
         not_equal(m, "NotEqual");
-    not_equal.doc() = "ngraph.op.NotEqual wraps ngraph::op::NotEqual";
+    not_equal.doc() = "ngraph.impl.op.NotEqual wraps ngraph::op::NotEqual";
     not_equal.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/one_hot.cpp

@@ -29,7 +29,7 @@ void regclass_pyngraph_op_OneHot(py::module m)
                std::shared_ptr<ngraph::op::OneHot>,
                ngraph::op::util::RequiresTensorViewArgs>
         onehot(m, "OneHot");
-    onehot.doc() = "ngraph.op.OneHot wraps ngraph::op::OneHot";
+    onehot.doc() = "ngraph.impl.op.OneHot wraps ngraph::op::OneHot";
     onehot.def(py::init<const std::shared_ptr<ngraph::Node>&, const ngraph::Shape&, size_t>());
     onehot.def("get_one_hot_axis", &ngraph::op::OneHot::get_one_hot_axis);
 }

python/pyngraph/ops/op.cpp

@@ -25,7 +25,7 @@ namespace py = pybind11;
 void regclass_pyngraph_op_Op(py::module m)
 {
     py::class_<ngraph::op::Op, std::shared_ptr<ngraph::op::Op>, ngraph::Node> op(m, "Op");
-    op.doc() = "ngraph.op.Op wraps ngraph::op::Op";
+    op.doc() = "ngraph.impl.op.Op wraps ngraph::op::Op";
     op.def_property(
         "op_annotations", &ngraph::op::Op::get_op_annotations, &ngraph::op::Op::set_op_annotations);
 }

python/pyngraph/ops/parameter.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Parameter(py::module m)
 {
     py::class_<ngraph::op::Parameter, std::shared_ptr<ngraph::op::Parameter>, ngraph::Node>
         parameter(m, "Parameter");
-    parameter.doc() = "ngraph.op.Parameter wraps ngraph::op::Parameter";
+    parameter.doc() = "ngraph.impl.op.Parameter wraps ngraph::op::Parameter";
     parameter.def("__repr__", [](const ngraph::Node& self) {
         std::string class_name = py::cast(self).get_type().attr("__name__").cast<std::string>();
         std::string shape = py::cast(self.get_shape()).attr("__str__")().cast<std::string>();

python/pyngraph/ops/parameter_vector.cpp

@@ -27,7 +27,7 @@ void regclass_pyngraph_op_ParameterVector(py::module m)
 {
     py::class_<ngraph::op::ParameterVector, std::shared_ptr<ngraph::op::ParameterVector>>
         parameter_vector(m, "ParameterVector");
-    parameter_vector.doc() = "ngraph.op.ParameterVector wraps ngraph::op::ParameterVector";
+    parameter_vector.doc() = "ngraph.impl.op.ParameterVector wraps ngraph::op::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>>&>());

python/pyngraph/ops/power.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Power(py::module m)
                std::shared_ptr<ngraph::op::Power>,
                ngraph::op::util::BinaryElementwiseArithmetic>
         power(m, "Power");
-    power.doc() = "ngraph.op.Power wraps ngraph::op::Power";
+    power.doc() = "ngraph.impl.op.Power wraps ngraph::op::Power";
     power.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/product.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Product(py::module m)
                std::shared_ptr<ngraph::op::Product>,
                ngraph::op::util::ArithmeticReduction>
         product(m, "Product");
-    product.doc() = "ngraph.op.Product wraps ngraph::op::Product";
+    product.doc() = "ngraph.impl.op.Product wraps ngraph::op::Product";
     product.def(py::init<const std::shared_ptr<ngraph::Node>&, const ngraph::AxisSet&>());
 }

python/pyngraph/ops/reduce.cpp

@@ -30,7 +30,7 @@ void regclass_pyngraph_op_Reduce(py::module m)
                std::shared_ptr<ngraph::op::Reduce>,
                ngraph::op::util::RequiresTensorViewArgs>
         reduce(m, "Reduce");
-    reduce.doc() = "ngraph.op.Reduce wraps ngraph::op::Reduce";
+    reduce.doc() = "ngraph.impl.op.Reduce wraps ngraph::op::Reduce";
     reduce.def(py::init<const std::shared_ptr<ngraph::Node>&,
                         const std::shared_ptr<ngraph::Node>&,
                         const std::shared_ptr<ngraph::Function>&,

python/pyngraph/ops/relu.cpp

@@ -27,7 +27,7 @@ void regclass_pyngraph_op_Relu(py::module m)
                std::shared_ptr<ngraph::op::Relu>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         relu(m, "Relu");
-    relu.doc() = "ngraph.op.Relu wraps ngraph::op::Relu";
+    relu.doc() = "ngraph.impl.op.Relu wraps ngraph::op::Relu";
     relu.def(py::init<std::shared_ptr<ngraph::Node>&>());
 }
 

python/pyngraph/ops/replace_slice.cpp

@@ -29,7 +29,7 @@ void regclass_pyngraph_op_ReplaceSlice(py::module m)
                std::shared_ptr<ngraph::op::ReplaceSlice>,
                ngraph::op::util::RequiresTensorViewArgs>
         replace_slice(m, "ReplaceSlice");
-    replace_slice.doc() = "ngraph.op.ReplaceSlice wraps ngraph::op::ReplaceSlice";
+    replace_slice.doc() = "ngraph.impl.op.ReplaceSlice wraps ngraph::op::ReplaceSlice";
     replace_slice.def(py::init<const std::shared_ptr<ngraph::Node>&,
                                const std::shared_ptr<ngraph::Node>&,
                                const ngraph::Coordinate&,

python/pyngraph/ops/reshape.cpp

@@ -29,7 +29,7 @@ void regclass_pyngraph_op_Reshape(py::module m)
                std::shared_ptr<ngraph::op::Reshape>,
                ngraph::op::util::RequiresTensorViewArgs>
         reshape(m, "Reshape");
-    reshape.doc() = "ngraph.op.Reshape wraps ngraph::op::Reshape";
+    reshape.doc() = "ngraph.impl.op.Reshape wraps ngraph::op::Reshape";
     reshape.def(py::init<const std::shared_ptr<ngraph::Node>&,
                          const ngraph::AxisVector&,
                          const ngraph::Shape&>());

python/pyngraph/ops/reverse.cpp

@@ -29,6 +29,6 @@ void regclass_pyngraph_op_Reverse(py::module m)
                std::shared_ptr<ngraph::op::Reverse>,
                ngraph::op::util::RequiresTensorViewArgs>
         reverse(m, "Reverse");
-    reverse.doc() = "ngraph.op.Reverse wraps ngraph::op::Reverse";
+    reverse.doc() = "ngraph.impl.op.Reverse wraps ngraph::op::Reverse";
     reverse.def(py::init<const std::shared_ptr<ngraph::Node>&, const ngraph::AxisSet&>());
 }

python/pyngraph/ops/select.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Select(py::module m)
                std::shared_ptr<ngraph::op::Select>,
                ngraph::op::util::RequiresTensorViewArgs>
         select(m, "Select");
-    select.doc() = "ngraph.op.Select wraps ngraph::op::Select";
+    select.doc() = "ngraph.impl.op.Select wraps ngraph::op::Select";
     select.def(py::init<const std::shared_ptr<ngraph::Node>&,
                         const std::shared_ptr<ngraph::Node>&,
                         const std::shared_ptr<ngraph::Node>&>());

python/pyngraph/ops/sign.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Sign(py::module m)
                std::shared_ptr<ngraph::op::Sign>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         sign(m, "Sign");
-    sign.doc() = "ngraph.op.Sign wraps ngraph::op::Sign";
+    sign.doc() = "ngraph.impl.op.Sign wraps ngraph::op::Sign";
     sign.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/sin.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Sin(py::module m)
                std::shared_ptr<ngraph::op::Sin>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         sin(m, "Sin");
-    sin.doc() = "ngraph.op.Sin wraps ngraph::op::Sin";
+    sin.doc() = "ngraph.impl.op.Sin wraps ngraph::op::Sin";
     sin.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/sinh.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Sinh(py::module m)
                std::shared_ptr<ngraph::op::Sinh>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         sinh(m, "Sinh");
-    sinh.doc() = "ngraph.op.Sinh wraps ngraph::op::Sinh";
+    sinh.doc() = "ngraph.impl.op.Sinh wraps ngraph::op::Sinh";
     sinh.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/slice.cpp

@@ -29,7 +29,7 @@ void regclass_pyngraph_op_Slice(py::module m)
                std::shared_ptr<ngraph::op::Slice>,
                ngraph::op::util::RequiresTensorViewArgs>
         slice(m, "Slice");
-    slice.doc() = "ngraph.op.Slice wraps ngraph::op::Slice";
+    slice.doc() = "ngraph.impl.op.Slice wraps ngraph::op::Slice";
     slice.def(py::init<const std::shared_ptr<ngraph::Node>&,
                        const ngraph::Coordinate&,
                        const ngraph::Coordinate&,

python/pyngraph/ops/softmax.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Softmax(py::module m)
                std::shared_ptr<ngraph::op::Softmax>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         softmax(m, "Softmax");
-    softmax.doc() = "ngraph.op.Softmax wraps ngraph::op::Softmax";
+    softmax.doc() = "ngraph.impl.op.Softmax wraps ngraph::op::Softmax";
     softmax.def(py::init<const std::shared_ptr<ngraph::Node>&, const ngraph::AxisSet&>());
 }

python/pyngraph/ops/sqrt.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Sqrt(py::module m)
                std::shared_ptr<ngraph::op::Sqrt>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         sqrt(m, "Sqrt");
-    sqrt.doc() = "ngraph.op.Sqrt wraps ngraph::op::Sqrt";
+    sqrt.doc() = "ngraph.impl.op.Sqrt wraps ngraph::op::Sqrt";
     sqrt.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/subtract.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_op_Subtract(py::module m)
                std::shared_ptr<ngraph::op::Subtract>,
                ngraph::op::util::BinaryElementwiseArithmetic>
         subtract(m, "Subtract");
-    subtract.doc() = "ngraph.op.Subtract wraps ngraph::op::Subtract";
+    subtract.doc() = "ngraph.impl.op.Subtract wraps ngraph::op::Subtract";
     subtract.def(
         py::init<const std::shared_ptr<ngraph::Node>&, const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/sum.cpp

@@ -29,6 +29,6 @@ void regclass_pyngraph_op_Sum(py::module m)
                std::shared_ptr<ngraph::op::Sum>,
                ngraph::op::util::RequiresTensorViewArgs>
         sum(m, "Sum");
-    sum.doc() = "ngraph.op.Sum wraps ngraph::op::Sum";
+    sum.doc() = "ngraph.impl.op.Sum wraps ngraph::op::Sum";
     sum.def(py::init<const std::shared_ptr<ngraph::Node>&, const ngraph::AxisSet&>());
 }

python/pyngraph/ops/tan.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Tan(py::module m)
                std::shared_ptr<ngraph::op::Tan>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         tan(m, "Tan");
-    tan.doc() = "ngraph.op.Tan wraps ngraph::op::Tan";
+    tan.doc() = "ngraph.impl.op.Tan wraps ngraph::op::Tan";
     tan.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/ops/tanh.cpp

@@ -27,6 +27,6 @@ void regclass_pyngraph_op_Tanh(py::module m)
                std::shared_ptr<ngraph::op::Tanh>,
                ngraph::op::util::UnaryElementwiseArithmetic>
         tanh(m, "Tanh");
-    tanh.doc() = "ngraph.op.Tanh wraps ngraph::op::Tanh";
+    tanh.doc() = "ngraph.impl.op.Tanh wraps ngraph::op::Tanh";
     tanh.def(py::init<const std::shared_ptr<ngraph::Node>&>());
 }

python/pyngraph/passes/manager.cpp

@@ -25,7 +25,7 @@ namespace py = pybind11;
 void regclass_pyngraph_passes_Manager(py::module m)
 {
     py::class_<ngraph::pass::Manager, std::shared_ptr<ngraph::pass::Manager>> manager(m, "Manager");
-    manager.doc() = "ngraph.pass.Manager wraps ngraph::pass::Manager";
+    manager.doc() = "ngraph.impl.pass.Manager wraps ngraph::pass::Manager";
     manager.def("run_passes", &ngraph::pass::Manager::run_passes);
     manager.def("register_pass",
                 &ngraph::pass::Manager::register_pass<ngraph::pass::ReshapeElimination>);

python/pyngraph/passes/regmodule_pyngraph_passes.cpp

@@ -21,6 +21,6 @@ namespace py = pybind11;
 
 void regmodule_pyngraph_passes(py::module m)
 {
-    py::module m_passes = m.def_submodule("passes", "Package ngraph.passes wraps ngraph::passes");
+    py::module m_passes = m.def_submodule("passes", "Package ngraph.impl.passes wraps ngraph::passes");
     regclass_pyngraph_passes_Manager(m_passes);
 }

python/pyngraph/pyngraph.cpp

@@ -21,7 +21,7 @@ namespace py = pybind11;
 
 PYBIND11_MODULE(_pyngraph, m)
 {
-    m.doc() = "Package ngraph that wraps nGraph's namespace ngraph";
+    m.doc() = "Package ngraph.impl that wraps nGraph's namespace ngraph";
     regclass_pyngraph_Node(m);
     regclass_pyngraph_NodeVector(m);
     regclass_pyngraph_Shape(m);
@@ -33,7 +33,7 @@ PYBIND11_MODULE(_pyngraph, m)
     regmodule_pyngraph_types(m);
     regclass_pyngraph_Function(m);
     regclass_pyngraph_Serializer(m);
-    py::module m_op = m.def_submodule("op", "Package ngraph.op that wraps ngraph::op");
+    py::module m_op = m.def_submodule("op", "Package ngraph.impl.op that wraps ngraph::op");
     regclass_pyngraph_op_Op(m_op);
     regmodule_pyngraph_op_util(m_op);
     regmodule_pyngraph_op(m_op);

python/pyngraph/runtime/backend.cpp

@@ -30,7 +30,7 @@ void regclass_pyngraph_runtime_Backend(py::module m)
 {
     py::class_<ngraph::runtime::Backend, std::shared_ptr<ngraph::runtime::Backend>> backend(
         m, "Backend");
-    backend.doc() = "ngraph.runtime.Backend wraps ngraph::runtime::Backend";
+    backend.doc() = "ngraph.impl.runtime.Backend wraps ngraph::runtime::Backend";
     backend.def("make_call_frame", &ngraph::runtime::Backend::make_call_frame);
     backend.def("make_primary_tensor_view",
                 (std::shared_ptr<ngraph::runtime::TensorView>(ngraph::runtime::Backend::*)(

python/pyngraph/runtime/call_frame.cpp

@@ -26,6 +26,6 @@ void regclass_pyngraph_runtime_CallFrame(py::module m)
 {
     py::class_<ngraph::runtime::CallFrame, std::shared_ptr<ngraph::runtime::CallFrame>> callFrame(
         m, "CallFrame");
-    callFrame.doc() = "ngraph.runtime.CallFrame wraps ngraph::runtime::CallFrame";
+    callFrame.doc() = "ngraph.impl.runtime.CallFrame wraps ngraph::runtime::CallFrame";
     callFrame.def("call", &ngraph::runtime::CallFrame::call);
 }

python/pyngraph/runtime/external_function.cpp

@@ -28,5 +28,5 @@ void regclass_pyngraph_runtime_ExternalFunction(py::module m)
                std::shared_ptr<ngraph::runtime::ExternalFunction>>
         externalFunction(m, "ExternalFunction");
     externalFunction.doc() =
-        "ngraph.runtime.ExternalFunction wraps ngraph::runtime::ExternalFunction";
+        "ngraph.impl.runtime.ExternalFunction wraps ngraph::runtime::ExternalFunction";
 }

python/pyngraph/runtime/manager.cpp

@@ -29,7 +29,7 @@ void regclass_pyngraph_runtime_Manager(py::module m)
 {
     py::class_<ngraph::runtime::Manager, std::shared_ptr<ngraph::runtime::Manager>> manager(
         m, "Manager");
-    manager.doc() = "ngraph.runtime.Manager wraps ngraph::runtime::Manager";
+    manager.doc() = "ngraph.impl.runtime.Manager wraps ngraph::runtime::Manager";
     manager.def_static("get", &ngraph::runtime::Manager::get);
     manager.def("compile", &ngraph::runtime::Manager::compile);
     manager.def("allocate_backend", &ngraph::runtime::Manager::allocate_backend);

python/pyngraph/runtime/regmodule_pyngraph_runtime.cpp

@@ -22,7 +22,7 @@ namespace py = pybind11;
 void regmodule_pyngraph_runtime(py::module m)
 {
     py::module m_runtime =
-        m.def_submodule("runtime", "Package ngraph.runtime wraps ngraph::runtime");
+        m.def_submodule("runtime", "Package ngraph.impl.runtime wraps ngraph::runtime");
     regclass_pyngraph_runtime_TensorView(m_runtime);
     regclass_pyngraph_runtime_Backend(m_runtime);
     regclass_pyngraph_runtime_CallFrame(m_runtime);

python/pyngraph/runtime/tensor_view.cpp

@@ -26,7 +26,7 @@ void regclass_pyngraph_runtime_TensorView(py::module m)
 {
     py::class_<ngraph::runtime::TensorView, std::shared_ptr<ngraph::runtime::TensorView>>
         tensorView(m, "TensorView");
-    tensorView.doc() = "ngraph.runtime.TensorView wraps ngraph::runtime::TensorView";
+    tensorView.doc() = "ngraph.impl.runtime.TensorView wraps ngraph::runtime::TensorView";
     tensorView.def("write",
                    (void (ngraph::runtime::TensorView::*)(const void*, size_t, size_t)) &
                        ngraph::runtime::TensorView::write);

python/pyngraph/shape.cpp

@@ -28,7 +28,7 @@ namespace py = pybind11;
 void regclass_pyngraph_Shape(py::module m)
 {
     py::class_<ngraph::Shape, std::shared_ptr<ngraph::Shape>> shape(m, "Shape");
-    shape.doc() = "ngraph.Shape wraps ngraph::Shape";
+    shape.doc() = "ngraph.impl.Shape wraps ngraph::Shape";
     shape.def(py::init<const std::initializer_list<size_t>&>());
     shape.def(py::init<const std::vector<size_t>&>());
     shape.def(py::init<const ngraph::Shape&>());

python/pyngraph/strides.cpp

@@ -24,7 +24,7 @@ namespace py = pybind11;
 void regclass_pyngraph_Strides(py::module m)
 {
     py::class_<ngraph::Strides, std::shared_ptr<ngraph::Strides>> strides(m, "Strides");
-    strides.doc() = "ngraph.Strides wraps ngraph::Strides";
+    strides.doc() = "ngraph.impl.Strides wraps ngraph::Strides";
     strides.def(py::init<const std::initializer_list<size_t>&>());
     strides.def(py::init<const std::vector<size_t>&>());
     strides.def(py::init<const ngraph::Strides&>());

python/pyngraph/types/element_type.cpp

@@ -25,7 +25,7 @@ namespace py = pybind11;
 void regclass_pyngraph_Type(py::module m)
 {
     py::class_<ngraph::element::Type, std::shared_ptr<ngraph::element::Type>> type(m, "Type");
-    type.doc() = "ngraph.Type wraps ngraph::element::Type";
+    type.doc() = "ngraph.impl.Type wraps ngraph::element::Type";
     type.attr("boolean") = ngraph::element::boolean;
     type.attr("f32") = ngraph::element::f32;
     type.attr("f64") = ngraph::element::f64;

python/pyngraph/types/type.cpp

@@ -28,7 +28,7 @@ void regclass_pyngraph_TensorViewType(py::module m)
 {
     py::class_<ngraph::TensorViewType, std::shared_ptr<ngraph::TensorViewType>> tensorViewType(
         m, "TensorViewType");
-    tensorViewType.doc() = "ngraph.TensorViewType wraps ngraph::TensorViewType";
+    tensorViewType.doc() = "ngraph.impl.TensorViewType wraps ngraph::TensorViewType";
     tensorViewType.def(py::init<const ngraph::element::Type&, const ngraph::Shape&>());
     tensorViewType.def("get_shape", &ngraph::TensorViewType::get_shape);
 }

python/pyngraph/util.cpp

@@ -27,6 +27,6 @@ void* numpy_to_c(py::array a)
 
 void regmodule_pyngraph_util(py::module m)
 {
-    py::module mod = m.def_submodule("util", "ngraph.util");
+    py::module mod = m.def_submodule("util", "ngraph.impl.util");
     mod.def("numpy_to_c", &numpy_to_c);
 }

python/setup.py.in

@@ -263,13 +263,14 @@ setup(
     long_description='',
     ext_modules=ext_modules,
     package_dir={'ngraph': PYNGRAPH_SOURCE_DIR + "/ngraph",
-                 'ngraph.op': PYNGRAPH_SOURCE_DIR + "/ngraph/op",
-                 'ngraph.op.util': PYNGRAPH_SOURCE_DIR + "/ngraph/op/util",
-                 'ngraph.passes': PYNGRAPH_SOURCE_DIR + "/ngraph/passes",
-                 'ngraph.runtime': PYNGRAPH_SOURCE_DIR + "/ngraph/runtime",
-                 'ngraph_api': PYNGRAPH_SOURCE_DIR + "/ngraph_api",
-                 'ngraph_api.utils': PYNGRAPH_SOURCE_DIR + "/ngraph_api/utils"},
-    packages = ['ngraph', 'ngraph.op', 'ngraph.op.util', 'ngraph.passes', 'ngraph.runtime', 'ngraph_api', 'ngraph_api.utils'],
+                 'ngraph.utils': PYNGRAPH_SOURCE_DIR + "/ngraph/utils",
+                 'ngraph.impl': PYNGRAPH_SOURCE_DIR + "/ngraph/impl",
+                 'ngraph.impl.op': PYNGRAPH_SOURCE_DIR + "/ngraph/impl/op",
+                 'ngraph.impl.op.util': PYNGRAPH_SOURCE_DIR + "/ngraph/impl/op/util",
+                 'ngraph.impl.passes': PYNGRAPH_SOURCE_DIR + "/ngraph/impl/passes",
+                 'ngraph.impl.runtime': PYNGRAPH_SOURCE_DIR + "/ngraph/impl/runtime"},
+    packages = ['ngraph', 'ngraph.utils', 'ngraph.impl', 'ngraph.impl.op',
+                'ngraph.impl.op.util', 'ngraph.impl.passes', 'ngraph.impl.runtime'],
     cmdclass={'build_ext': BuildExt},
     data_files = data_files,
     install_requires = requirements,

python/test/ngraph_api/test_basic.py → python/test/ngraph/test_basic.py

@@ -17,7 +17,7 @@
 import numpy as np
 import pytest
 
-import ngraph_api as ng
+import ngraph as ng
 
 
 @pytest.mark.parametrize('dtype', [np.float32, np.float64,

python/test/ngraph_api/test_convolution.py → python/test/ngraph/test_convolution.py

@@ -17,7 +17,7 @@
 import numpy as np
 import pytest
 
-import ngraph_api as ng
+import ngraph as ng
 
 
 def test_default_arguments_convolution_2d():

python/test/ngraph_api/test_ops_binary.py → python/test/ngraph/test_ops_binary.py

@@ -18,7 +18,7 @@ import operator
 import numpy as np
 import pytest
 
-import ngraph_api as ng
+import ngraph as ng
 
 
 @pytest.mark.parametrize('ng_api_helper,numpy_function', [

python/test/ngraph_api/test_reduction.py → python/test/ngraph/test_reduction.py

@@ -16,7 +16,7 @@
 import numpy as np
 import pytest
 
-import ngraph_api as ng
+import ngraph as ng
 
 
 @pytest.mark.parametrize('ng_api_helper, numpy_function, reduction_axes', [

python/test/test_ops.py

@@ -17,21 +17,21 @@
 import pytest
 import numpy as np
 
-from ngraph import util
-from ngraph import Shape, Strides, CoordinateDiff, AxisSet, AxisVector, Coordinate
-from ngraph import Type, Function, NodeVector
-from ngraph.runtime import Manager
-from ngraph.op import Acos, Asin, Atan, Cos, Sin, Tan
-from ngraph.op import Cosh, Sinh, Tanh, Sqrt, Sign
-from ngraph.op import Power, Negative, Ceiling, Floor
-from ngraph.op import Parameter, Maximum, Minimum
-from ngraph.op import Add, Subtract, Multiply, Divide, Dot
-from ngraph.op import Constant, Abs, Exp, Log, Sum
-from ngraph.op import Greater, Less, Equal, NotEqual, GreaterEq, LessEq, Not
-from ngraph.op import OneHot, Broadcast, Reshape, Convert, Reduce
-from ngraph.op import Concat, Select
-from ngraph.op import Reverse, MaxPool, ReplaceSlice, Slice
-from ngraph.op import Convolution, ConvolutionBackpropData, ConvolutionBackpropFilters
+from ngraph.impl import util
+from ngraph.impl import Shape, Strides, CoordinateDiff, AxisSet, AxisVector, Coordinate
+from ngraph.impl import Type, Function, NodeVector
+from ngraph.impl.runtime import Manager
+from ngraph.impl.op import Acos, Asin, Atan, Cos, Sin, Tan
+from ngraph.impl.op import Cosh, Sinh, Tanh, Sqrt, Sign
+from ngraph.impl.op import Power, Negative, Ceiling, Floor
+from ngraph.impl.op import Parameter, Maximum, Minimum
+from ngraph.impl.op import Add, Subtract, Multiply, Divide, Dot
+from ngraph.impl.op import Constant, Abs, Exp, Log, Sum
+from ngraph.impl.op import Greater, Less, Equal, NotEqual, GreaterEq, LessEq, Not
+from ngraph.impl.op import OneHot, Broadcast, Reshape, Convert, Reduce
+from ngraph.impl.op import Concat, Select
+from ngraph.impl.op import Reverse, MaxPool, ReplaceSlice, Slice
+from ngraph.impl.op import Convolution, ConvolutionBackpropData, ConvolutionBackpropFilters
 
 
 def make_backend_call_frame(function):

python/tox.ini

@@ -20,15 +20,15 @@ deps =
   flake8-bugbear
 commands=
   {envbindir}/python setup.py develop
-  flake8 {posargs:pyngraph/ ngraph/ ngraph_api/ examples/}
+  flake8 {posargs:pyngraph/ ngraph/ examples/}
   flake8 --ignore=D100,D101,D102,D103,D104,D105,D107 test/  # ignore lack of docs in tests
-  mypy --config-file=tox.ini {posargs:pyngraph/ ngraph/ ngraph_api/ examples/} # Use MyPy in Python 3 only
+  mypy --config-file=tox.ini {posargs:pyngraph/ ngraph/ examples/} # Use MyPy in Python 3 only
   pytest {posargs:test/}
 
 [testenv:py27]
 commands=
   {envbindir}/python setup.py develop
-  flake8 {posargs:pyngraph/ ngraph/ ngraph_api/ examples/}
+  flake8 {posargs:pyngraph/ ngraph/ examples/}
   flake8 --ignore=D100,D101,D102,D103,D104,D105,D107 test/  # ignore lack of docs in tests
   pytest {posargs:test/}
 
@@ -60,7 +60,7 @@ show_column_numbers = True
 show_none_errors  = True
 
 # put custom per-file options here in sections that map their names into filenames, e.g. gta_workflow/filename.py is
-# [mypy-ngraph_api/filename]
+# [mypy-ngraph/filename]
 
 [mypy-test.*]
 disallow_untyped_defs = False