Revert "[Py OV] Add utils to openvino module (openvinotoolkit#28062)"

This reverts commit 1dd6492.

src/bindings/python/src/openvino/__init__.py

@@ -7,7 +7,7 @@
 # Required for Windows OS platforms
 # Note: always top-level
 try:
-    from openvino.package_utils import _add_openvino_libs_to_search_path
+    from openvino.utils import _add_openvino_libs_to_search_path
     _add_openvino_libs_to_search_path()
 except ImportError:
     pass

src/bindings/python/src/openvino/runtime/opset_utils.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2018-2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+from typing import Optional
+import numpy as np
+
+from openvino.runtime import Node
+from openvino.runtime.utils.decorators import nameable_op
+from openvino.runtime.utils.node_factory import NodeFactory
+from openvino.runtime.utils.types import (
+    as_node,
+    NodeInput,
+)
+
+
+def _get_node_factory(opset_version: Optional[str] = None) -> NodeFactory:
+    """Return NodeFactory configured to create operators from specified opset version."""
+    if opset_version:
+        return NodeFactory(opset_version)
+    else:
+        return NodeFactory()

src/bindings/python/src/openvino/runtime/utils/__init__.py

@@ -4,4 +4,4 @@
 
 """Generic utilities. Factor related functions out to separate files."""
 
-from openvino.utils import numpy_to_c, replace_node, replace_output_update_name
+from openvino._pyopenvino.util import numpy_to_c, replace_node, replace_output_update_name

src/bindings/python/src/openvino/utils/broadcasting.py → src/bindings/python/src/openvino/runtime/utils/broadcasting.py

@@ -3,11 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
-from typing import Optional
+from typing import List, Optional
 
-from openvino.runtime import AxisSet
-from openvino.utils.types import (
+from openvino.runtime import AxisSet, Node
+from openvino.runtime.utils.types import (
+    NodeInput,
     TensorShape,
+    get_dtype,
+    make_constant_node,
 )
 
 log = logging.getLogger(__name__)

src/bindings/python/src/openvino/runtime/utils/data_helpers/__init__.py

@@ -2,7 +2,7 @@
 # Copyright (C) 2018-2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-from openvino.utils.data_helpers.data_dispatcher import _data_dispatch
-from openvino.utils.data_helpers.wrappers import tensor_from_file
-from openvino.utils.data_helpers.wrappers import _InferRequestWrapper
-from openvino.utils.data_helpers.wrappers import OVDict
+from openvino.runtime.utils.data_helpers.data_dispatcher import _data_dispatch
+from openvino.runtime.utils.data_helpers.wrappers import tensor_from_file
+from openvino.runtime.utils.data_helpers.wrappers import _InferRequestWrapper
+from openvino.runtime.utils.data_helpers.wrappers import OVDict

src/bindings/python/src/openvino/utils/data_helpers/data_dispatcher.py → src/bindings/python/src/openvino/runtime/utils/data_helpers/data_dispatcher.py

@@ -8,7 +8,7 @@
 import numpy as np
 
 from openvino._pyopenvino import ConstOutput, Tensor, Type, RemoteTensor
-from openvino.utils.data_helpers.wrappers import _InferRequestWrapper, OVDict
+from openvino.runtime.utils.data_helpers.wrappers import _InferRequestWrapper, OVDict
 
 ContainerTypes = Union[dict, list, tuple, OVDict]
 ScalarTypes = Union[np.number, int, float]

src/bindings/python/src/openvino/utils/decorators.py → src/bindings/python/src/openvino/runtime/utils/decorators.py

@@ -7,7 +7,7 @@
 from typing import Any, Callable, Dict, Optional, Union, get_origin, get_args
 
 from openvino.runtime import Node, Output
-from openvino.utils.types import NodeInput, as_node, as_nodes
+from openvino.runtime.utils.types import NodeInput, as_node, as_nodes
 
 
 def _get_name(**kwargs: Any) -> Node:

src/bindings/python/src/openvino/utils/node_factory.py → src/bindings/python/src/openvino/runtime/utils/node_factory.py

@@ -2,8 +2,9 @@
 # Copyright (C) 2018-2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
+import logging as log
 
-from functools import singledispatchmethod
+from functools import partial, singledispatchmethod
 from typing import Any, Dict, List, Optional, Union
 from pathlib import Path
 
@@ -124,11 +125,3 @@ def _arguments_as_outputs(arguments: List[Union[Node, Output]]) -> List[Output]:
             else:
                 outputs.extend(argument.outputs())
         return outputs
-
-
-def _get_node_factory(opset_version: Optional[str] = None) -> NodeFactory:
-    """Return NodeFactory configured to create operators from specified opset version."""
-    if opset_version:
-        return NodeFactory(opset_version)
-    else:
-        return NodeFactory()

src/bindings/python/src/openvino/utils/types.py → src/bindings/python/src/openvino/runtime/utils/types.py

@@ -11,7 +11,7 @@
 
 from openvino.runtime.exceptions import OVTypeError
 from openvino.runtime import Node, Shape, Output, Type
-from openvino.op import Constant
+from openvino.runtime.op import Constant
 
 log = logging.getLogger(__name__)
 

src/bindings/python/src/openvino/package_utils.py → src/bindings/python/src/openvino/utils.py

@@ -21,9 +21,9 @@ def _add_openvino_libs_to_search_path() -> None:
         if os.path.isdir(os.path.join(os.path.dirname(__file__), "libs")):
             # looking for the libs in the pip installation path.
             openvino_libs.append(os.path.join(os.path.dirname(__file__), "libs"))
-        elif os.path.isdir(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, "Library", "bin")):
+        elif os.path.isdir(os.path.join(os.path.dirname(__file__), "..", "..", "..", "Library", "bin")):
             # looking for the libs in the conda installation path
-            openvino_libs.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, "Library", "bin"))
+            openvino_libs.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "Library", "bin"))
         else:
             # setupvars.bat script set all libs paths to OPENVINO_LIB_PATHS environment variable.
             openvino_libs_installer = os.getenv("OPENVINO_LIB_PATHS")

tools/benchmark_tool/openvino/__init__.py

@@ -7,7 +7,7 @@
 # Required for Windows OS platforms
 # Note: always top-level
 try:
-    from openvino.package_utils import _add_openvino_libs_to_search_path
+    from openvino.utils import _add_openvino_libs_to_search_path
     _add_openvino_libs_to_search_path()
 except ImportError:
     pass

tools/mo/openvino/__init__.py

@@ -7,7 +7,7 @@
 # Required for Windows OS platforms
 # Note: always top-level
 try:
-    from openvino.package_utils import _add_openvino_libs_to_search_path
+    from openvino.utils import _add_openvino_libs_to_search_path
     _add_openvino_libs_to_search_path()
 except ImportError:
     pass

tools/openvino_dev/src/openvino/__init__.py

@@ -7,7 +7,7 @@
 # Required for Windows OS platforms
 # Note: always top-level
 try:
-    from openvino.package_utils import _add_openvino_libs_to_search_path
+    from openvino.utils import _add_openvino_libs_to_search_path
     _add_openvino_libs_to_search_path()
 except ImportError:
     pass

tools/ovc/openvino/__init__.py

@@ -7,7 +7,7 @@
 # Required for Windows OS platforms
 # Note: always top-level
 try:
-    from openvino.package_utils import _add_openvino_libs_to_search_path
+    from openvino.utils import _add_openvino_libs_to_search_path
     _add_openvino_libs_to_search_path()
 except ImportError:
     pass