working wheel

ngraph/python/setup.py

@@ -280,7 +280,7 @@ print("NGRAPH_CPP_LIBRARY_NAME, ONNX_IMPORTER_CPP_LIBRARY_NAME", NGRAPH_CPP_LIBR
 
 ext_modules = [
     Extension(
-        "_pyngraph",
+        "ngraph.pyngraph",
         sources=sources,
         include_dirs=include_dirs,
         define_macros=[("VERSION_INFO", __version__)],

ngraph/python/src/ngraph/impl/__init__.py

@@ -25,25 +25,25 @@ import sys
 
 if sys.platform == "win32":
     # ngraph.dll is installed 3 directories above by default
-    # and this path needs to be visible to the _pyngraph module
+    # and this path needs to be visible to the ngraph.pyngraph module
     #
     # If you're using a custom installation of nGraph,
     # add the location of ngraph.dll to your system PATH.
     ngraph_dll = os.path.join(os.path.dirname(__file__), "..", "..", "..")
     os.environ["PATH"] = os.path.abspath(ngraph_dll) + ";" + os.environ["PATH"]
 
-from _pyngraph import Dimension
+from ngraph.pyngraph import Dimension
-from _pyngraph import Function
+from ngraph.pyngraph import Function
-from _pyngraph import Input
+from ngraph.pyngraph import Input
-from _pyngraph import Output
+from ngraph.pyngraph import Output
-from _pyngraph import Node
+from ngraph.pyngraph import Node
-from _pyngraph import Type
+from ngraph.pyngraph import Type
-from _pyngraph import PartialShape
+from ngraph.pyngraph import PartialShape
-from _pyngraph import Shape
+from ngraph.pyngraph import Shape
-from _pyngraph import Strides
+from ngraph.pyngraph import Strides
-from _pyngraph import CoordinateDiff
+from ngraph.pyngraph import CoordinateDiff
-from _pyngraph import AxisSet
+from ngraph.pyngraph import AxisSet
-from _pyngraph import AxisVector
+from ngraph.pyngraph import AxisVector
-from _pyngraph import Coordinate
+from ngraph.pyngraph import Coordinate
 
-from _pyngraph import util
+from ngraph.pyngraph import util

ngraph/python/src/ngraph/impl/op/__init__.py

@@ -22,7 +22,7 @@ Low level wrappers for the nGraph c++ api in ngraph::op.
 
 import numpy as np
 
-from _pyngraph.op import Constant
+from ngraph.pyngraph.op import Constant
 
 """ Retrieve Constant inner data.
 
@@ -32,4 +32,4 @@ from _pyngraph.op import Constant
 """
 Constant.get_data = lambda self: np.array(self, copy=True)
 
-from _pyngraph.op import Parameter
+from ngraph.pyngraph.op import Parameter

ngraph/python/src/ngraph/impl/op/util/__init__.py

@@ -19,10 +19,10 @@ Low level wrappers for the nGraph c++ api in ngraph::op::util.
 """
 # flake8: noqa
 
-from _pyngraph.op.util import UnaryElementwiseArithmetic
+from ngraph.pyngraph.op.util import UnaryElementwiseArithmetic
-from _pyngraph.op.util import BinaryElementwiseComparison
+from ngraph.pyngraph.op.util import BinaryElementwiseComparison
-from _pyngraph.op.util import BinaryElementwiseArithmetic
+from ngraph.pyngraph.op.util import BinaryElementwiseArithmetic
-from _pyngraph.op.util import BinaryElementwiseLogical
+from ngraph.pyngraph.op.util import BinaryElementwiseLogical
-from _pyngraph.op.util import OpAnnotations
+from ngraph.pyngraph.op.util import OpAnnotations
-from _pyngraph.op.util import ArithmeticReduction
+from ngraph.pyngraph.op.util import ArithmeticReduction
-from _pyngraph.op.util import IndexReduction
+from ngraph.pyngraph.op.util import IndexReduction

ngraph/python/src/ngraph/impl/passes/__init__.py

@@ -15,4 +15,4 @@
 # ******************************************************************************
 # flake8: noqa
 
-from _pyngraph.passes import Manager
+from ngraph.pyngraph.passes import Manager

ngraph/python/src/ngraph/utils/node_factory.py

@@ -1,7 +1,7 @@
 from functools import partial
 from typing import Any, Dict, List, Optional
 
-from _pyngraph import NodeFactory as _NodeFactory
+from ngraph.pyngraph import NodeFactory as _NodeFactory
 
 from ngraph.impl import Node
 

ngraph/python/src/pyngraph/pyngraph.cpp

@@ -43,7 +43,7 @@
 
 namespace py = pybind11;
 
-PYBIND11_MODULE(_pyngraph, m)
+PYBIND11_MODULE(pyngraph, m)
 {
     m.doc() = "Package ngraph.impl that wraps nGraph's namespace ngraph";
     regclass_pyngraph_PyRTMap(m);

ngraph/python/src/pyngraph/util.py

@@ -15,6 +15,6 @@
 # ******************************************************************************
 # flake8: noqa
 
-from _pyngraph import util
+from ngraph.pyngraph import util
 
 numpy_to_c = util.numpy_to_c

ngraph/python/tests/test_ngraph/__init__.py

@@ -1,3 +1,3 @@
-# ngraph.dll directory path visibility is needed to use _pyngraph module
+# ngraph.dll directory path visibility is needed to use ngraph.pyngraph module
 # import below causes adding this path to os.environ["PATH"]
 import ngraph  # noqa: F401 'imported but unused'

ngraph/python/tests/test_ngraph/test_basic.py

@@ -18,7 +18,7 @@ import json
 import numpy as np
 import pytest
 
-from _pyngraph import VariantInt, VariantString
+from ngraph.pyngraph import VariantInt, VariantString
 
 import ngraph as ng
 from ngraph.exceptions import UserInputError

ngraph/python/tests/test_ngraph/test_create_op.py

@@ -15,7 +15,7 @@
 # ******************************************************************************
 import numpy as np
 import pytest
-from _pyngraph import PartialShape
+from ngraph.pyngraph import PartialShape
 
 import ngraph as ng
 import ngraph.opset1 as ng_opset1

ngraph/python/tests/test_ngraph/test_node_factory.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 # ******************************************************************************
 import numpy as np
-from _pyngraph import NodeFactory as _NodeFactory
+from ngraph.pyngraph import NodeFactory as _NodeFactory
 
 import ngraph as ng
 

ngraph/python/tests/test_ngraph/test_reduction.py

@@ -15,7 +15,7 @@
 # ******************************************************************************
 import numpy as np
 import pytest
-from _pyngraph import PartialShape
+from ngraph.pyngraph import PartialShape
 
 import ngraph as ng
 from tests.runtime import get_runtime