From 1dd6492710f61edbab3634ce16066ea14e9b7d80 Mon Sep 17 00:00:00 2001 From: Alicja Miloszewska Date: Mon, 16 Dec 2024 15:01:53 +0100 Subject: [PATCH] [Py OV] Add utils to openvino module (#28062) ### Details: - Move `runtime/utils/` to openvino - Add proxy locations in `openvino/runtime/utils/` - create proxy for `openvino/runtime/opset_utils.py`. It contained one internal function => `_get_node_factory`. Move its location to `openvino/utils/node_factory.py`. - Rename `utils.py` to `package_utils.py`. Import its functionality in `openvino/utils/__init__.py` so it's accessible for a user in the same way (except internal `_add_openvino_libs_to_search_path` and `_ClassPropertyDescriptor`) NOTE: on Windows `_add_openvino_libs_to_search_path` has to be called (and initialized) on top of `openvino.__init__`, especially before `_pyopenvino` imports. Part of `openvino.runtime` deprecation ### Tickets: [CVS-129450](https://jira.devtools.intel.com/browse/CVS-129450) --------- Signed-off-by: Alicja Miloszewska Co-authored-by: Anastasia Kuporosova --- src/bindings/python/src/openvino/__init__.py | 2 +- .../openvino/{utils.py => package_utils.py} | 4 ++-- .../src/openvino/runtime/opset_utils.py | 22 ------------------- .../openvino/runtime/opset_utils/__init__.py | 6 +++++ .../src/openvino/runtime/utils/__init__.py | 2 +- .../runtime/utils/broadcasting/__init__.py | 5 +++++ .../runtime/utils/data_helpers/__init__.py | 8 +++---- .../data_helpers/data_dispatcher/__init__.py | 20 +++++++++++++++++ .../utils/data_helpers/wrappers/__init__.py | 8 +++++++ .../runtime/utils/decorators/__init__.py | 13 +++++++++++ .../utils/input_validation/__init__.py | 10 +++++++++ .../runtime/utils/node_factory/__init__.py | 5 +++++ .../runtime/utils/reduction/__init__.py | 5 +++++ .../openvino/runtime/utils/types/__init__.py | 21 ++++++++++++++++++ .../python/src/openvino/utils/__init__.py | 12 ++++++++++ .../{runtime => }/utils/broadcasting.py | 9 +++----- .../openvino/utils/data_helpers/__init__.py | 8 +++++++ .../utils/data_helpers/data_dispatcher.py | 2 +- .../utils/data_helpers/wrappers.py | 0 .../{runtime => }/utils/decorators.py | 2 +- .../{runtime => }/utils/input_validation.py | 0 .../{runtime => }/utils/node_factory.py | 11 ++++++++-- .../openvino/{runtime => }/utils/reduction.py | 0 .../src/openvino/{runtime => }/utils/types.py | 2 +- tools/benchmark_tool/openvino/__init__.py | 2 +- tools/mo/openvino/__init__.py | 2 +- tools/openvino_dev/src/openvino/__init__.py | 2 +- tools/ovc/openvino/__init__.py | 2 +- 28 files changed, 140 insertions(+), 45 deletions(-) rename src/bindings/python/src/openvino/{utils.py => package_utils.py} (97%) delete mode 100644 src/bindings/python/src/openvino/runtime/opset_utils.py create mode 100644 src/bindings/python/src/openvino/runtime/opset_utils/__init__.py create mode 100644 src/bindings/python/src/openvino/runtime/utils/broadcasting/__init__.py create mode 100644 src/bindings/python/src/openvino/runtime/utils/data_helpers/data_dispatcher/__init__.py create mode 100644 src/bindings/python/src/openvino/runtime/utils/data_helpers/wrappers/__init__.py create mode 100644 src/bindings/python/src/openvino/runtime/utils/decorators/__init__.py create mode 100644 src/bindings/python/src/openvino/runtime/utils/input_validation/__init__.py create mode 100644 src/bindings/python/src/openvino/runtime/utils/node_factory/__init__.py create mode 100644 src/bindings/python/src/openvino/runtime/utils/reduction/__init__.py create mode 100644 src/bindings/python/src/openvino/runtime/utils/types/__init__.py create mode 100644 src/bindings/python/src/openvino/utils/__init__.py rename src/bindings/python/src/openvino/{runtime => }/utils/broadcasting.py (87%) create mode 100644 src/bindings/python/src/openvino/utils/data_helpers/__init__.py rename src/bindings/python/src/openvino/{runtime => }/utils/data_helpers/data_dispatcher.py (99%) rename src/bindings/python/src/openvino/{runtime => }/utils/data_helpers/wrappers.py (100%) rename src/bindings/python/src/openvino/{runtime => }/utils/decorators.py (98%) rename src/bindings/python/src/openvino/{runtime => }/utils/input_validation.py (100%) rename src/bindings/python/src/openvino/{runtime => }/utils/node_factory.py (94%) rename src/bindings/python/src/openvino/{runtime => }/utils/reduction.py (100%) rename src/bindings/python/src/openvino/{runtime => }/utils/types.py (99%) diff --git a/src/bindings/python/src/openvino/__init__.py b/src/bindings/python/src/openvino/__init__.py index 69c678909b1c9e..e3e878564f3313 100644 --- a/src/bindings/python/src/openvino/__init__.py +++ b/src/bindings/python/src/openvino/__init__.py @@ -7,7 +7,7 @@ # Required for Windows OS platforms # Note: always top-level try: - from openvino.utils import _add_openvino_libs_to_search_path + from openvino.package_utils import _add_openvino_libs_to_search_path _add_openvino_libs_to_search_path() except ImportError: pass diff --git a/src/bindings/python/src/openvino/utils.py b/src/bindings/python/src/openvino/package_utils.py similarity index 97% rename from src/bindings/python/src/openvino/utils.py rename to src/bindings/python/src/openvino/package_utils.py index 9890ae9b3e6460..6aa3f3ed39b556 100644 --- a/src/bindings/python/src/openvino/utils.py +++ b/src/bindings/python/src/openvino/package_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__), "..", "..", "..", "Library", "bin")): + elif os.path.isdir(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, "Library", "bin")): # looking for the libs in the conda installation path - openvino_libs.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "Library", "bin")) + openvino_libs.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, "Library", "bin")) else: # setupvars.bat script set all libs paths to OPENVINO_LIB_PATHS environment variable. openvino_libs_installer = os.getenv("OPENVINO_LIB_PATHS") diff --git a/src/bindings/python/src/openvino/runtime/opset_utils.py b/src/bindings/python/src/openvino/runtime/opset_utils.py deleted file mode 100644 index 475750e71f87c5..00000000000000 --- a/src/bindings/python/src/openvino/runtime/opset_utils.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- 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() diff --git a/src/bindings/python/src/openvino/runtime/opset_utils/__init__.py b/src/bindings/python/src/openvino/runtime/opset_utils/__init__.py new file mode 100644 index 00000000000000..6fb3e5f6f0c950 --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/opset_utils/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + + +from openvino.utils.node_factory import _get_node_factory diff --git a/src/bindings/python/src/openvino/runtime/utils/__init__.py b/src/bindings/python/src/openvino/runtime/utils/__init__.py index 73399ccbed2598..8447e93a907277 100644 --- a/src/bindings/python/src/openvino/runtime/utils/__init__.py +++ b/src/bindings/python/src/openvino/runtime/utils/__init__.py @@ -4,4 +4,4 @@ """Generic utilities. Factor related functions out to separate files.""" -from openvino._pyopenvino.util import numpy_to_c, replace_node, replace_output_update_name +from openvino.utils import numpy_to_c, replace_node, replace_output_update_name diff --git a/src/bindings/python/src/openvino/runtime/utils/broadcasting/__init__.py b/src/bindings/python/src/openvino/runtime/utils/broadcasting/__init__.py new file mode 100644 index 00000000000000..3219f239f0ab44 --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/utils/broadcasting/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +from openvino.utils.broadcasting import get_broadcast_axes diff --git a/src/bindings/python/src/openvino/runtime/utils/data_helpers/__init__.py b/src/bindings/python/src/openvino/runtime/utils/data_helpers/__init__.py index a46105efaaeadb..282547dd9df79a 100644 --- a/src/bindings/python/src/openvino/runtime/utils/data_helpers/__init__.py +++ b/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.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 +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 diff --git a/src/bindings/python/src/openvino/runtime/utils/data_helpers/data_dispatcher/__init__.py b/src/bindings/python/src/openvino/runtime/utils/data_helpers/data_dispatcher/__init__.py new file mode 100644 index 00000000000000..e0a2d022660dd3 --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/utils/data_helpers/data_dispatcher/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + + +from openvino.utils.data_helpers.data_dispatcher import ContainerTypes +from openvino.utils.data_helpers.data_dispatcher import ScalarTypes +from openvino.utils.data_helpers.data_dispatcher import ValidKeys + +from openvino.utils.data_helpers.data_dispatcher import is_list_simple_type +from openvino.utils.data_helpers.data_dispatcher import get_request_tensor +from openvino.utils.data_helpers.data_dispatcher import value_to_tensor +from openvino.utils.data_helpers.data_dispatcher import to_c_style +from openvino.utils.data_helpers.data_dispatcher import normalize_arrays +from openvino.utils.data_helpers.data_dispatcher import create_shared +from openvino.utils.data_helpers.data_dispatcher import set_request_tensor +from openvino.utils.data_helpers.data_dispatcher import update_tensor +from openvino.utils.data_helpers.data_dispatcher import update_inputs +from openvino.utils.data_helpers.data_dispatcher import create_copied +from openvino.utils.data_helpers.data_dispatcher import _data_dispatch diff --git a/src/bindings/python/src/openvino/runtime/utils/data_helpers/wrappers/__init__.py b/src/bindings/python/src/openvino/runtime/utils/data_helpers/wrappers/__init__.py new file mode 100644 index 00000000000000..22214fd24682da --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/utils/data_helpers/wrappers/__init__.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + + +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 diff --git a/src/bindings/python/src/openvino/runtime/utils/decorators/__init__.py b/src/bindings/python/src/openvino/runtime/utils/decorators/__init__.py new file mode 100644 index 00000000000000..bb0bac112d2c5f --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/utils/decorators/__init__.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +from openvino.utils.decorators import _get_name +from openvino.utils.decorators import _set_node_friendly_name +from openvino.utils.decorators import nameable_op +from openvino.utils.decorators import unary_op +from openvino.utils.decorators import binary_op +from openvino.utils.decorators import custom_preprocess_function +from openvino.utils.decorators import MultiMethod +from openvino.utils.decorators import registry +from openvino.utils.decorators import overloading diff --git a/src/bindings/python/src/openvino/runtime/utils/input_validation/__init__.py b/src/bindings/python/src/openvino/runtime/utils/input_validation/__init__.py new file mode 100644 index 00000000000000..0b49e9ea33c40d --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/utils/input_validation/__init__.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +from openvino.utils.input_validation import assert_list_of_ints +from openvino.utils.input_validation import _check_value +from openvino.utils.input_validation import check_valid_attribute +from openvino.utils.input_validation import check_valid_attributes +from openvino.utils.input_validation import is_positive_value +from openvino.utils.input_validation import is_non_negative_value diff --git a/src/bindings/python/src/openvino/runtime/utils/node_factory/__init__.py b/src/bindings/python/src/openvino/runtime/utils/node_factory/__init__.py new file mode 100644 index 00000000000000..945ea8deb7863c --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/utils/node_factory/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +from openvino.utils.node_factory import NodeFactory diff --git a/src/bindings/python/src/openvino/runtime/utils/reduction/__init__.py b/src/bindings/python/src/openvino/runtime/utils/reduction/__init__.py new file mode 100644 index 00000000000000..a2fbff9e793dca --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/utils/reduction/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +from openvino.utils.reduction import get_reduction_axes diff --git a/src/bindings/python/src/openvino/runtime/utils/types/__init__.py b/src/bindings/python/src/openvino/runtime/utils/types/__init__.py new file mode 100644 index 00000000000000..4f88d609988e8d --- /dev/null +++ b/src/bindings/python/src/openvino/runtime/utils/types/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +from openvino.utils.types import TensorShape +from openvino.utils.types import NumericData +from openvino.utils.types import NumericType +from openvino.utils.types import ScalarData +from openvino.utils.types import NodeInput + +from openvino.utils.types import openvino_to_numpy_types_map +from openvino.utils.types import openvino_to_numpy_types_str_map +from openvino.utils.types import get_element_type +from openvino.utils.types import get_element_type_str +from openvino.utils.types import get_dtype +from openvino.utils.types import get_numpy_ctype +from openvino.utils.types import get_ndarray +from openvino.utils.types import get_shape +from openvino.utils.types import make_constant_node +from openvino.utils.types import as_node +from openvino.utils.types import as_nodes diff --git a/src/bindings/python/src/openvino/utils/__init__.py b/src/bindings/python/src/openvino/utils/__init__.py new file mode 100644 index 00000000000000..2ccc79d20cce84 --- /dev/null +++ b/src/bindings/python/src/openvino/utils/__init__.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2018-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +"""Generic utilities. Factor related functions out to separate files.""" + +from openvino._pyopenvino.util import numpy_to_c, replace_node, replace_output_update_name + +from openvino.package_utils import get_cmake_path +from openvino.package_utils import deprecated +from openvino.package_utils import classproperty +from openvino.package_utils import deprecatedclassproperty diff --git a/src/bindings/python/src/openvino/runtime/utils/broadcasting.py b/src/bindings/python/src/openvino/utils/broadcasting.py similarity index 87% rename from src/bindings/python/src/openvino/runtime/utils/broadcasting.py rename to src/bindings/python/src/openvino/utils/broadcasting.py index 9fd13da7728e29..a950aea9bba820 100644 --- a/src/bindings/python/src/openvino/runtime/utils/broadcasting.py +++ b/src/bindings/python/src/openvino/utils/broadcasting.py @@ -3,14 +3,11 @@ # SPDX-License-Identifier: Apache-2.0 import logging -from typing import List, Optional +from typing import Optional -from openvino.runtime import AxisSet, Node -from openvino.runtime.utils.types import ( - NodeInput, +from openvino.runtime import AxisSet +from openvino.utils.types import ( TensorShape, - get_dtype, - make_constant_node, ) log = logging.getLogger(__name__) diff --git a/src/bindings/python/src/openvino/utils/data_helpers/__init__.py b/src/bindings/python/src/openvino/utils/data_helpers/__init__.py new file mode 100644 index 00000000000000..282547dd9df79a --- /dev/null +++ b/src/bindings/python/src/openvino/utils/data_helpers/__init__.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# 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 diff --git a/src/bindings/python/src/openvino/runtime/utils/data_helpers/data_dispatcher.py b/src/bindings/python/src/openvino/utils/data_helpers/data_dispatcher.py similarity index 99% rename from src/bindings/python/src/openvino/runtime/utils/data_helpers/data_dispatcher.py rename to src/bindings/python/src/openvino/utils/data_helpers/data_dispatcher.py index bce10c9c3774ef..d4db7cb07b629c 100644 --- a/src/bindings/python/src/openvino/runtime/utils/data_helpers/data_dispatcher.py +++ b/src/bindings/python/src/openvino/utils/data_helpers/data_dispatcher.py @@ -8,7 +8,7 @@ import numpy as np from openvino._pyopenvino import ConstOutput, Tensor, Type, RemoteTensor -from openvino.runtime.utils.data_helpers.wrappers import _InferRequestWrapper, OVDict +from openvino.utils.data_helpers.wrappers import _InferRequestWrapper, OVDict ContainerTypes = Union[dict, list, tuple, OVDict] ScalarTypes = Union[np.number, int, float] diff --git a/src/bindings/python/src/openvino/runtime/utils/data_helpers/wrappers.py b/src/bindings/python/src/openvino/utils/data_helpers/wrappers.py similarity index 100% rename from src/bindings/python/src/openvino/runtime/utils/data_helpers/wrappers.py rename to src/bindings/python/src/openvino/utils/data_helpers/wrappers.py diff --git a/src/bindings/python/src/openvino/runtime/utils/decorators.py b/src/bindings/python/src/openvino/utils/decorators.py similarity index 98% rename from src/bindings/python/src/openvino/runtime/utils/decorators.py rename to src/bindings/python/src/openvino/utils/decorators.py index 98da1ba4389ef7..604c0745860bf6 100644 --- a/src/bindings/python/src/openvino/runtime/utils/decorators.py +++ b/src/bindings/python/src/openvino/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.runtime.utils.types import NodeInput, as_node, as_nodes +from openvino.utils.types import NodeInput, as_node, as_nodes def _get_name(**kwargs: Any) -> Node: diff --git a/src/bindings/python/src/openvino/runtime/utils/input_validation.py b/src/bindings/python/src/openvino/utils/input_validation.py similarity index 100% rename from src/bindings/python/src/openvino/runtime/utils/input_validation.py rename to src/bindings/python/src/openvino/utils/input_validation.py diff --git a/src/bindings/python/src/openvino/runtime/utils/node_factory.py b/src/bindings/python/src/openvino/utils/node_factory.py similarity index 94% rename from src/bindings/python/src/openvino/runtime/utils/node_factory.py rename to src/bindings/python/src/openvino/utils/node_factory.py index 25daf739223dba..9841daaea4e818 100644 --- a/src/bindings/python/src/openvino/runtime/utils/node_factory.py +++ b/src/bindings/python/src/openvino/utils/node_factory.py @@ -2,9 +2,8 @@ # Copyright (C) 2018-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -import logging as log -from functools import partial, singledispatchmethod +from functools import singledispatchmethod from typing import Any, Dict, List, Optional, Union from pathlib import Path @@ -125,3 +124,11 @@ 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() diff --git a/src/bindings/python/src/openvino/runtime/utils/reduction.py b/src/bindings/python/src/openvino/utils/reduction.py similarity index 100% rename from src/bindings/python/src/openvino/runtime/utils/reduction.py rename to src/bindings/python/src/openvino/utils/reduction.py diff --git a/src/bindings/python/src/openvino/runtime/utils/types.py b/src/bindings/python/src/openvino/utils/types.py similarity index 99% rename from src/bindings/python/src/openvino/runtime/utils/types.py rename to src/bindings/python/src/openvino/utils/types.py index 52f1faf8e1e839..854cc0c7f6411d 100644 --- a/src/bindings/python/src/openvino/runtime/utils/types.py +++ b/src/bindings/python/src/openvino/utils/types.py @@ -11,7 +11,7 @@ from openvino.runtime.exceptions import OVTypeError from openvino.runtime import Node, Shape, Output, Type -from openvino.runtime.op import Constant +from openvino.op import Constant log = logging.getLogger(__name__) diff --git a/tools/benchmark_tool/openvino/__init__.py b/tools/benchmark_tool/openvino/__init__.py index 69c678909b1c9e..e3e878564f3313 100644 --- a/tools/benchmark_tool/openvino/__init__.py +++ b/tools/benchmark_tool/openvino/__init__.py @@ -7,7 +7,7 @@ # Required for Windows OS platforms # Note: always top-level try: - from openvino.utils import _add_openvino_libs_to_search_path + from openvino.package_utils import _add_openvino_libs_to_search_path _add_openvino_libs_to_search_path() except ImportError: pass diff --git a/tools/mo/openvino/__init__.py b/tools/mo/openvino/__init__.py index b015570964c520..46e35babdc9fad 100644 --- a/tools/mo/openvino/__init__.py +++ b/tools/mo/openvino/__init__.py @@ -7,7 +7,7 @@ # Required for Windows OS platforms # Note: always top-level try: - from openvino.utils import _add_openvino_libs_to_search_path + from openvino.package_utils import _add_openvino_libs_to_search_path _add_openvino_libs_to_search_path() except ImportError: pass diff --git a/tools/openvino_dev/src/openvino/__init__.py b/tools/openvino_dev/src/openvino/__init__.py index b015570964c520..46e35babdc9fad 100644 --- a/tools/openvino_dev/src/openvino/__init__.py +++ b/tools/openvino_dev/src/openvino/__init__.py @@ -7,7 +7,7 @@ # Required for Windows OS platforms # Note: always top-level try: - from openvino.utils import _add_openvino_libs_to_search_path + from openvino.package_utils import _add_openvino_libs_to_search_path _add_openvino_libs_to_search_path() except ImportError: pass diff --git a/tools/ovc/openvino/__init__.py b/tools/ovc/openvino/__init__.py index 69c678909b1c9e..e3e878564f3313 100644 --- a/tools/ovc/openvino/__init__.py +++ b/tools/ovc/openvino/__init__.py @@ -7,7 +7,7 @@ # Required for Windows OS platforms # Note: always top-level try: - from openvino.utils import _add_openvino_libs_to_search_path + from openvino.package_utils import _add_openvino_libs_to_search_path _add_openvino_libs_to_search_path() except ImportError: pass