Align mo and ov dev inits with ov init

Signed-off-by: Alicja Miloszewska <[email protected]>
openvinotoolkit · Dec 17, 2024 · 22d0a33 · 22d0a33
1 parent 32b63b9
commit 22d0a33
Show file tree

Hide file tree

Showing 2 changed files with 194 additions and 90 deletions.
diff --git a/tools/mo/openvino/__init__.py b/tools/mo/openvino/__init__.py
@@ -12,57 +12,109 @@
 except ImportError:
     pass
 
-# OpenVINO API
-try:
-    # Import all public modules
-    from openvino import runtime as runtime
-    from openvino import frontend as frontend
-    from openvino import helpers as helpers
-    from openvino import preprocess as preprocess
-    from openvino import utils as utils
-    from openvino import properties as properties
+# #
+# # OpenVINO API
+# # This __init__.py forces checking of runtime modules to propagate errors.
+# # It is not compared with init files from openvino-dev package.
+# #
 
-    # Import most important classes and functions from openvino.runtime
-    from openvino.runtime import Model
-    from openvino.runtime import Core
-    from openvino.runtime import CompiledModel
-    from openvino.runtime import InferRequest
-    from openvino.runtime import AsyncInferQueue
+# Openvino pybind bindings
+from openvino._pyopenvino import AxisSet
+from openvino._pyopenvino import AxisVector
+from openvino._pyopenvino import ConstOutput
+from openvino._pyopenvino import Coordinate
+from openvino._pyopenvino import CoordinateDiff
+from openvino._pyopenvino import DiscreteTypeInfo
+from openvino._pyopenvino import Extension
+from openvino._pyopenvino import ProfilingInfo
+from openvino._pyopenvino import RTMap
+from openvino._pyopenvino import Version
+from openvino._pyopenvino import Symbol
+from openvino._pyopenvino import Dimension
+from openvino._pyopenvino import Input
+from openvino._pyopenvino import Output
+from openvino._pyopenvino import Node
+from openvino._pyopenvino import Strides
+from openvino._pyopenvino import PartialShape
+from openvino._pyopenvino import Shape
+from openvino._pyopenvino import Layout
+from openvino._pyopenvino import Type
+from openvino._pyopenvino import Tensor
+from openvino._pyopenvino import OVAny
+from openvino._pyopenvino import get_batch
+from openvino._pyopenvino import set_batch
+from openvino._pyopenvino import serialize
+from openvino._pyopenvino import shutdown
+from openvino._pyopenvino import save_model
+from openvino._pyopenvino import layout_helpers
+from openvino._pyopenvino import RemoteContext
+from openvino._pyopenvino import RemoteTensor
+from openvino._pyopenvino import Op
 
-    from openvino.runtime import Symbol
-    from openvino.runtime import Dimension
-    from openvino.runtime import Strides
-    from openvino.runtime import PartialShape
-    from openvino.runtime import Shape
-    from openvino.runtime import Layout
-    from openvino.runtime import Type
-    from openvino.runtime import Tensor
-    from openvino.runtime import OVAny
+# Import public classes from _ov_api
+from openvino._ov_api import Model
+from openvino._ov_api import Core
+from openvino._ov_api import CompiledModel
+from openvino._ov_api import InferRequest
+from openvino._ov_api import AsyncInferQueue
 
-    from openvino.runtime import compile_model
-    from openvino.runtime import get_batch
-    from openvino.runtime import set_batch
-    from openvino.runtime import serialize
-    from openvino.runtime import shutdown
-    from openvino.runtime import tensor_from_file
-    from openvino.runtime import save_model
-    from openvino.runtime import layout_helpers
+# Import all public modules
+from openvino import runtime as runtime
+from openvino import frontend as frontend
+from openvino import helpers as helpers
+from openvino import experimental as experimental
+from openvino import preprocess as preprocess
+from openvino import utils as utils
+from openvino import properties as properties
 
-    from openvino._pyopenvino import Node
-    from openvino._pyopenvino import RemoteContext
-    from openvino._pyopenvino import RemoteTensor
-    from openvino._pyopenvino import Op
+# Helper functions for openvino module
+from openvino.utils.data_helpers import tensor_from_file
+from openvino._ov_api import compile_model
 
-    # libva related:
-    from openvino._pyopenvino import VAContext
-    from openvino._pyopenvino import VASurfaceTensor
 
-    # Set version for openvino package
-    from openvino.runtime import get_version
-    __version__ = get_version()
-except ImportError:
-    import warnings
-    warnings.warn("openvino package has problems with imports!", ImportWarning, stacklevel=2)
+# Import opsets
+from openvino import opset1
+from openvino import opset2
+from openvino import opset3
+from openvino import opset4
+from openvino import opset5
+from openvino import opset6
+from openvino import opset7
+from openvino import opset8
+from openvino import opset9
+from openvino import opset10
+from openvino import opset11
+from openvino import opset12
+from openvino import opset13
+from openvino import opset14
+from openvino import opset15
+from openvino import opset16
+
+# Extend Node class to support binary operators
+Node.__add__ = opset13.add
+Node.__sub__ = opset13.subtract
+Node.__mul__ = opset13.multiply
+Node.__div__ = opset13.divide
+Node.__truediv__ = opset13.divide
+Node.__radd__ = lambda left, right: opset13.add(right, left)
+Node.__rsub__ = lambda left, right: opset13.subtract(right, left)
+Node.__rmul__ = lambda left, right: opset13.multiply(right, left)
+Node.__rdiv__ = lambda left, right: opset13.divide(right, left)
+Node.__rtruediv__ = lambda left, right: opset13.divide(right, left)
+Node.__eq__ = utils.deprecated(version="2025.3", message="Use ops.equal instead")(opset13.equal)
+Node.__ne__ = utils.deprecated(version="2025.3", message="Use ops.not_equal instead")(opset13.not_equal)
+Node.__lt__ = utils.deprecated(version="2025.3", message="Use ops.less instead")(opset13.less)
+Node.__le__ = utils.deprecated(version="2025.3", message="Use ops.less_equal instead")(opset13.less_equal)
+Node.__gt__ = utils.deprecated(version="2025.3", message="Use ops.greater instead")(opset13.greater)
+Node.__ge__ = utils.deprecated(version="2025.3", message="Use ops.greater_equal instead")(opset13.greater_equal)
+
+# libva related:
+from openvino._pyopenvino import VAContext
+from openvino._pyopenvino import VASurfaceTensor
+
+# Set version for openvino package
+from openvino._pyopenvino import get_version
+__version__ = get_version()
 
 # Tools
 try:

diff --git a/tools/openvino_dev/src/openvino/__init__.py b/tools/openvino_dev/src/openvino/__init__.py
@@ -12,57 +12,109 @@
 except ImportError:
     pass
 
-# OpenVINO API
-try:
-    # Import all public modules
-    from openvino import runtime as runtime
-    from openvino import frontend as frontend
-    from openvino import helpers as helpers
-    from openvino import preprocess as preprocess
-    from openvino import utils as utils
-    from openvino import properties as properties
+# #
+# # OpenVINO API
+# # This __init__.py forces checking of runtime modules to propagate errors.
+# # It is not compared with init files from openvino-dev package.
+# #
 
-    # Import most important classes and functions from openvino.runtime
-    from openvino.runtime import Model
-    from openvino.runtime import Core
-    from openvino.runtime import CompiledModel
-    from openvino.runtime import InferRequest
-    from openvino.runtime import AsyncInferQueue
+# Openvino pybind bindings
+from openvino._pyopenvino import AxisSet
+from openvino._pyopenvino import AxisVector
+from openvino._pyopenvino import ConstOutput
+from openvino._pyopenvino import Coordinate
+from openvino._pyopenvino import CoordinateDiff
+from openvino._pyopenvino import DiscreteTypeInfo
+from openvino._pyopenvino import Extension
+from openvino._pyopenvino import ProfilingInfo
+from openvino._pyopenvino import RTMap
+from openvino._pyopenvino import Version
+from openvino._pyopenvino import Symbol
+from openvino._pyopenvino import Dimension
+from openvino._pyopenvino import Input
+from openvino._pyopenvino import Output
+from openvino._pyopenvino import Node
+from openvino._pyopenvino import Strides
+from openvino._pyopenvino import PartialShape
+from openvino._pyopenvino import Shape
+from openvino._pyopenvino import Layout
+from openvino._pyopenvino import Type
+from openvino._pyopenvino import Tensor
+from openvino._pyopenvino import OVAny
+from openvino._pyopenvino import get_batch
+from openvino._pyopenvino import set_batch
+from openvino._pyopenvino import serialize
+from openvino._pyopenvino import shutdown
+from openvino._pyopenvino import save_model
+from openvino._pyopenvino import layout_helpers
+from openvino._pyopenvino import RemoteContext
+from openvino._pyopenvino import RemoteTensor
+from openvino._pyopenvino import Op
 
-    from openvino.runtime import Symbol
-    from openvino.runtime import Dimension
-    from openvino.runtime import Strides
-    from openvino.runtime import PartialShape
-    from openvino.runtime import Shape
-    from openvino.runtime import Layout
-    from openvino.runtime import Type
-    from openvino.runtime import Tensor
-    from openvino.runtime import OVAny
+# Import public classes from _ov_api
+from openvino._ov_api import Model
+from openvino._ov_api import Core
+from openvino._ov_api import CompiledModel
+from openvino._ov_api import InferRequest
+from openvino._ov_api import AsyncInferQueue
 
-    from openvino.runtime import compile_model
-    from openvino.runtime import get_batch
-    from openvino.runtime import set_batch
-    from openvino.runtime import serialize
-    from openvino.runtime import shutdown
-    from openvino.runtime import tensor_from_file
-    from openvino.runtime import save_model
-    from openvino.runtime import layout_helpers
+# Import all public modules
+from openvino import runtime as runtime
+from openvino import frontend as frontend
+from openvino import helpers as helpers
+from openvino import experimental as experimental
+from openvino import preprocess as preprocess
+from openvino import utils as utils
+from openvino import properties as properties
 
-    from openvino._pyopenvino import Node
-    from openvino._pyopenvino import RemoteContext
-    from openvino._pyopenvino import RemoteTensor
-    from openvino._pyopenvino import Op
+# Helper functions for openvino module
+from openvino.utils.data_helpers import tensor_from_file
+from openvino._ov_api import compile_model
 
-    # libva related:
-    from openvino._pyopenvino import VAContext
-    from openvino._pyopenvino import VASurfaceTensor
 
-    # Set version for openvino package
-    from openvino.runtime import get_version
-    __version__ = get_version()
-except ImportError:
-    import warnings
-    warnings.warn("openvino package has problems with imports!", ImportWarning, stacklevel=2)
+# Import opsets
+from openvino import opset1
+from openvino import opset2
+from openvino import opset3
+from openvino import opset4
+from openvino import opset5
+from openvino import opset6
+from openvino import opset7
+from openvino import opset8
+from openvino import opset9
+from openvino import opset10
+from openvino import opset11
+from openvino import opset12
+from openvino import opset13
+from openvino import opset14
+from openvino import opset15
+from openvino import opset16
+
+# Extend Node class to support binary operators
+Node.__add__ = opset13.add
+Node.__sub__ = opset13.subtract
+Node.__mul__ = opset13.multiply
+Node.__div__ = opset13.divide
+Node.__truediv__ = opset13.divide
+Node.__radd__ = lambda left, right: opset13.add(right, left)
+Node.__rsub__ = lambda left, right: opset13.subtract(right, left)
+Node.__rmul__ = lambda left, right: opset13.multiply(right, left)
+Node.__rdiv__ = lambda left, right: opset13.divide(right, left)
+Node.__rtruediv__ = lambda left, right: opset13.divide(right, left)
+Node.__eq__ = utils.deprecated(version="2025.3", message="Use ops.equal instead")(opset13.equal)
+Node.__ne__ = utils.deprecated(version="2025.3", message="Use ops.not_equal instead")(opset13.not_equal)
+Node.__lt__ = utils.deprecated(version="2025.3", message="Use ops.less instead")(opset13.less)
+Node.__le__ = utils.deprecated(version="2025.3", message="Use ops.less_equal instead")(opset13.less_equal)
+Node.__gt__ = utils.deprecated(version="2025.3", message="Use ops.greater instead")(opset13.greater)
+Node.__ge__ = utils.deprecated(version="2025.3", message="Use ops.greater_equal instead")(opset13.greater_equal)
+
+# libva related:
+from openvino._pyopenvino import VAContext
+from openvino._pyopenvino import VASurfaceTensor
+
+# Set version for openvino package
+from openvino._pyopenvino import get_version
+__version__ = get_version()
 
 # Tools
 try: