IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PyOV] mark pyopenvino as internal (#13427)

Browse Source 
* [PyOV] makrk pyopenvino as internal

* change pyov -> _pyov

* change pyov -> _pyov

* replace impor in py files

* change install path

* undo some changes

* Revert "undo some changes"

This reverts commit 9e5794a394c1b7cd1823f70a0ddd4f8742547edf.

* replace in rest files

* keep folder w/o underscore

* undo changes in ci configs

* improve changes in cmake

* add pyopenvino deprecation warning

Co-authored-by: Adam Tumialis <adam.tumialis@intel.com>
This commit is contained in:
Anastasia Kuporosova
2022-10-26 12:51:31 +02:00
committed by GitHub
parent f893a58816
commit 9872a34bb9
28 changed files with 149 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/bindings/python/docs/code_examples.md
View File

@@ -127,7 +127,7 @@ Add a new submodule by writing:
```cpp
py::module mymodule = m.def_submodule("mymodule", "My first feature - openvino.runtime.mymodule");
```
This is a shorthand way of adding new submodules which can later be used to extend the package. The mysterious `m` is actaully the main OpenVINO:tm: module called `pyopenvino` -- it is registered with `PYBIND11_MODULE(pyopenvino, m)` at the top of the "registering-point" file. Later imports from it are done by calling upon the `openvino.pyopenvino` package.
This is a shorthand way of adding new submodules which can later be used to extend the package. The mysterious `m` is actaully the main OpenVINO:tm: module called `pyopenvino` -- it is registered with `PYBIND11_MODULE(pyopenvino, m)` at the top of the "registering-point" file. Later imports from it are done by calling upon the `openvino._pyopenvino` package.
Keep in mind that in most real-life scenarios, modules and classes are registered in different files. The general idea is to create a helper function that will hold all of the registered modules, classes, and functions. This function needs to be exposed within a separate header file and included in "registering-point". The project's common guideline suggests to use names in the following convention: `regmodule_[domain]_[name_of_the_module]` or `regclass_[domain]_[name_of_the_class]`. Where optional `[domain]` generally points to parts of the API such as graph or frontend, or stay empty in the case of core runtime. Examples can be found in the "registering-point" file, `openvino/src/bindings/python/src/pyopenvino/pyopenvino.cpp`.
@@ -220,7 +220,7 @@ mymodule.def("get_smile", []() {
**Don't forget to rebuild the project** and test it out:
```python
import openvino.pyopenvino.mymodule as mymodule
import openvino._pyopenvino.mymodule as mymodule
from openvino.runtime import Tensor, Type
a = mymodule.MyTensor([1,2,3])
@@ -276,7 +276,7 @@ cls.def("say_hello", [](const MyTensor& self, std::string& message) {
**Don't forget to rebuild the project** and test it out:
```python
import openvino.pyopenvino.mymodule as mymodule
import openvino._pyopenvino.mymodule as mymodule
a = mymodule.MyTensor([1,2,3])
a.say_hello()
>>> Hello there!
@@ -293,10 +293,10 @@ a.say_hello(777)
>>> Traceback (most recent call last):
>>> File "<stdin>", line 1, in <module>
>>> TypeError: say_hello(): incompatible function arguments. The following argument types are supported:
>>> 1. (self: openvino.pyopenvino.mymodule.MyTensor) -> None
>>> 2. (self: openvino.pyopenvino.mymodule.MyTensor, arg0: str) -> None
>>> 1. (self: openvino._pyopenvino.mymodule.MyTensor) -> None
>>> 2. (self: openvino._pyopenvino.mymodule.MyTensor, arg0: str) -> None
>>>
>>> Invoked with: <openvino.pyopenvino.mymodule.MyTensor object at >>> 0x7fdfef5bb4f0>, 777
>>> Invoked with: <openvino._pyopenvino.mymodule.MyTensor object at >>> 0x7fdfef5bb4f0>, 777
```
Notice that only functions with correct arguments are **not** throwing exceptions. It is helpful to combine this method with your code when binding templated or multi-argument functions. Most of the time (but not always!), using this approach saves a lot of written code, reducing `if-else/switch-case` blocks to a minimum, thus making it cleaner and easier to understand.
<!-- Link to one of our classes? --->
@@ -311,16 +311,16 @@ Notice that only functions with correct arguments are **not** throwing exception
Although *pybind11* is a powerful tool, it is sometimes required (or simply easier and more efficent) to combine both approaches and utilize both languages to achive best results.
##### Making pybind11-based module/class visible in OpenVINO:tm: package
Let's move a new class from `openvino.pyopenvino.mymodule` to the actual package. Simply introduce a new import statement in the desired file. Let it be `openvino/src/bindings/python/src/openvino/runtime/__init__.py`:
Let's move a new class from `openvino._pyopenvino.mymodule` to the actual package. Simply introduce a new import statement in the desired file. Let it be `openvino/src/bindings/python/src/openvino/runtime/__init__.py`:
```python
from openvino.pyopenvino.mymodule import MyTensor
from openvino._pyopenvino.mymodule import MyTensor
```
Now, while importing `openvino`, a new class is accessible from the `runtime` level:
```python
import openvino.runtime as ov
ov.MyTensor
>>> <class 'openvino.pyopenvino.mymodule.MyTensor'>
>>> <class 'openvino._pyopenvino.mymodule.MyTensor'>
```
Same rule applies to whole modules and free functions. **This is a required step when adding something to the public API**. Without exposing it, all of the work is hidden in the depths of the `pyopenvino` namespace, rendering it hard to access for the user.
@@ -330,7 +330,7 @@ As mentioned earlier, it may be helpful to utilize Python in-between to achieve
First, create a new file in the `openvino/src/bindings/python/src/openvino/runtime` directory and call it `mymodule_ext.py`. There are no strict rules for naming, just make sure the names are in good taste. Import the class here:
```python
from openvino.pyopenvino.mymodule import MyTensor as MyTensorBase
from openvino._pyopenvino.mymodule import MyTensor as MyTensorBase
```
Notice how an alias is created for the `MyTensor` class. Do not worry, it will make sense as we progress. Let's follow it up with a more advanced class implementation:

24
src/bindings/python/src/openvino/_offline_transformations/__init__.py
View File

@@ -7,17 +7,17 @@
from openvino.utils import add_openvino_libs_to_path
add_openvino_libs_to_path()
from openvino.pyopenvino import get_version
from openvino._pyopenvino import get_version
__version__ = get_version()
from openvino.pyopenvino._offline_transformations import apply_fused_names_cleanup
from openvino.pyopenvino._offline_transformations import apply_moc_transformations
from openvino.pyopenvino._offline_transformations import apply_moc_legacy_transformations
from openvino.pyopenvino._offline_transformations import apply_pot_transformations
from openvino.pyopenvino._offline_transformations import apply_low_latency_transformation
from openvino.pyopenvino._offline_transformations import apply_pruning_transformation
from openvino.pyopenvino._offline_transformations import generate_mapping_file
from openvino.pyopenvino._offline_transformations import apply_make_stateful_transformation
from openvino.pyopenvino._offline_transformations import compress_model_transformation
from openvino.pyopenvino._offline_transformations import compress_quantize_weights_transformation
from openvino.pyopenvino._offline_transformations import convert_sequence_to_tensor_iterator_transformation
from openvino._pyopenvino._offline_transformations import apply_fused_names_cleanup
from openvino._pyopenvino._offline_transformations import apply_moc_transformations
from openvino._pyopenvino._offline_transformations import apply_moc_legacy_transformations
from openvino._pyopenvino._offline_transformations import apply_pot_transformations
from openvino._pyopenvino._offline_transformations import apply_low_latency_transformation
from openvino._pyopenvino._offline_transformations import apply_pruning_transformation
from openvino._pyopenvino._offline_transformations import generate_mapping_file
from openvino._pyopenvino._offline_transformations import apply_make_stateful_transformation
from openvino._pyopenvino._offline_transformations import compress_model_transformation
from openvino._pyopenvino._offline_transformations import compress_quantize_weights_transformation
from openvino._pyopenvino._offline_transformations import convert_sequence_to_tensor_iterator_transformation

34
src/bindings/python/src/openvino/frontend/__init__.py
View File

@@ -11,27 +11,27 @@ Low level wrappers for the FrontEnd C++ API.
from openvino.utils import add_openvino_libs_to_path
add_openvino_libs_to_path()
from openvino.pyopenvino import get_version
from openvino._pyopenvino import get_version
__version__ = get_version()
# main classes
from openvino.pyopenvino import FrontEndManager
from openvino.pyopenvino import FrontEnd
from openvino.pyopenvino import InputModel
from openvino.pyopenvino import NodeContext
from openvino.pyopenvino import Place
from openvino._pyopenvino import FrontEndManager
from openvino._pyopenvino import FrontEnd
from openvino._pyopenvino import InputModel
from openvino._pyopenvino import NodeContext
from openvino._pyopenvino import Place
# extensions
from openvino.pyopenvino import DecoderTransformationExtension
from openvino.pyopenvino import JsonConfigExtension
from openvino.pyopenvino import ConversionExtension
from openvino.pyopenvino import OpExtension
from openvino.pyopenvino import ProgressReporterExtension
from openvino.pyopenvino import TelemetryExtension
from openvino._pyopenvino import DecoderTransformationExtension
from openvino._pyopenvino import JsonConfigExtension
from openvino._pyopenvino import ConversionExtension
from openvino._pyopenvino import OpExtension
from openvino._pyopenvino import ProgressReporterExtension
from openvino._pyopenvino import TelemetryExtension
# exceptions
from openvino.pyopenvino import NotImplementedFailure
from openvino.pyopenvino import InitializationFailure
from openvino.pyopenvino import OpConversionFailure
from openvino.pyopenvino import OpValidationFailure
from openvino.pyopenvino import GeneralFailure
from openvino._pyopenvino import NotImplementedFailure
from openvino._pyopenvino import InitializationFailure
from openvino._pyopenvino import OpConversionFailure
from openvino._pyopenvino import OpValidationFailure
from openvino._pyopenvino import GeneralFailure

6
src/bindings/python/src/openvino/offline_transformations/__init__.py
View File

@@ -15,9 +15,9 @@ warnings.warn(message="The module is private and following namespace "
from openvino.utils import add_openvino_libs_to_path, deprecated
add_openvino_libs_to_path()
from openvino.pyopenvino import get_version
from openvino.pyopenvino import serialize as _base_serialize
import openvino.pyopenvino._offline_transformations as _base
from openvino._pyopenvino import get_version
from openvino._pyopenvino import serialize as _base_serialize
import openvino._pyopenvino._offline_transformations as _base
__version__ = get_version()

24
src/bindings/python/src/openvino/preprocess/__init__.py
View File

@@ -11,18 +11,18 @@ Low level wrappers for the PrePostProcessing C++ API.
from openvino.utils import add_openvino_libs_to_path
add_openvino_libs_to_path()
from openvino.pyopenvino import get_version
from openvino._pyopenvino import get_version
__version__ = get_version()
# main classes
from openvino.pyopenvino.preprocess import InputInfo
from openvino.pyopenvino.preprocess import OutputInfo
from openvino.pyopenvino.preprocess import InputTensorInfo
from openvino.pyopenvino.preprocess import OutputTensorInfo
from openvino.pyopenvino.preprocess import InputModelInfo
from openvino.pyopenvino.preprocess import OutputModelInfo
from openvino.pyopenvino.preprocess import PrePostProcessor
from openvino.pyopenvino.preprocess import PreProcessSteps
from openvino.pyopenvino.preprocess import PostProcessSteps
from openvino.pyopenvino.preprocess import ColorFormat
from openvino.pyopenvino.preprocess import ResizeAlgorithm
from openvino._pyopenvino.preprocess import InputInfo
from openvino._pyopenvino.preprocess import OutputInfo
from openvino._pyopenvino.preprocess import InputTensorInfo
from openvino._pyopenvino.preprocess import OutputTensorInfo
from openvino._pyopenvino.preprocess import InputModelInfo
from openvino._pyopenvino.preprocess import OutputModelInfo
from openvino._pyopenvino.preprocess import PrePostProcessor
from openvino._pyopenvino.preprocess import PreProcessSteps
from openvino._pyopenvino.preprocess import PostProcessSteps
from openvino._pyopenvino.preprocess import ColorFormat
from openvino._pyopenvino.preprocess import ResizeAlgorithm

14
src/bindings/python/src/openvino/pyopenvino/__init__.py Normal file
View File

@@ -0,0 +1,14 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2018-2022 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
# flake8: noqa
# type: ignore
import warnings
warnings.warn(message="The module is private and following namespace "
"`pyopenvino` will be removed in the future",
category=FutureWarning)
from openvino._pyopenvino import *

56
src/bindings/python/src/openvino/runtime/__init__.py
View File

@@ -8,40 +8,40 @@
from openvino.utils import add_openvino_libs_to_path
add_openvino_libs_to_path()
from openvino.pyopenvino import get_version
from openvino._pyopenvino import get_version
__version__ = get_version()
# Openvino pybind bindings and python extended classes
from openvino.pyopenvino import Dimension
from openvino.pyopenvino import Model
from openvino.pyopenvino import Input
from openvino.pyopenvino import Output
from openvino.pyopenvino import Node
from openvino.pyopenvino import Type
from openvino.pyopenvino import PartialShape
from openvino.pyopenvino import Shape
from openvino.pyopenvino import Strides
from openvino.pyopenvino import CoordinateDiff
from openvino.pyopenvino import DiscreteTypeInfo
from openvino.pyopenvino import AxisSet
from openvino.pyopenvino import AxisVector
from openvino.pyopenvino import Coordinate
from openvino.pyopenvino import Layout
from openvino.pyopenvino import ConstOutput
from openvino.pyopenvino import layout_helpers
from openvino.pyopenvino import OVAny
from openvino.pyopenvino import RTMap
from openvino._pyopenvino import Dimension
from openvino._pyopenvino import Model
from openvino._pyopenvino import Input
from openvino._pyopenvino import Output
from openvino._pyopenvino import Node
from openvino._pyopenvino import Type
from openvino._pyopenvino import PartialShape
from openvino._pyopenvino import Shape
from openvino._pyopenvino import Strides
from openvino._pyopenvino import CoordinateDiff
from openvino._pyopenvino import DiscreteTypeInfo
from openvino._pyopenvino import AxisSet
from openvino._pyopenvino import AxisVector
from openvino._pyopenvino import Coordinate
from openvino._pyopenvino import Layout
from openvino._pyopenvino import ConstOutput
from openvino._pyopenvino import layout_helpers
from openvino._pyopenvino import OVAny
from openvino._pyopenvino import RTMap
from openvino.runtime.ie_api import Core
from openvino.runtime.ie_api import CompiledModel
from openvino.runtime.ie_api import InferRequest
from openvino.runtime.ie_api import AsyncInferQueue
from openvino.pyopenvino import Version
from openvino.pyopenvino import Tensor
from openvino.pyopenvino import Extension
from openvino.pyopenvino import ProfilingInfo
from openvino.pyopenvino import get_batch
from openvino.pyopenvino import set_batch
from openvino.pyopenvino import serialize
from openvino._pyopenvino import Version
from openvino._pyopenvino import Tensor
from openvino._pyopenvino import Extension
from openvino._pyopenvino import ProfilingInfo
from openvino._pyopenvino import get_batch
from openvino._pyopenvino import set_batch
from openvino._pyopenvino import serialize
# Import opsets
from openvino.runtime import opset1
@@ -56,7 +56,7 @@ from openvino.runtime import opset9
from openvino.runtime import opset10
# Import properties API
from openvino.pyopenvino import properties
from openvino._pyopenvino import properties
# Helper functions for openvino module
from openvino.runtime.ie_api import tensor_from_file

14
src/bindings/python/src/openvino/runtime/ie_api.py
View File

@@ -8,13 +8,13 @@ from pathlib import Path
import numpy as np
from openvino.pyopenvino import Model
from openvino.pyopenvino import Core as CoreBase
from openvino.pyopenvino import CompiledModel as CompiledModelBase
from openvino.pyopenvino import InferRequest as InferRequestBase
from openvino.pyopenvino import AsyncInferQueue as AsyncInferQueueBase
from openvino.pyopenvino import ConstOutput
from openvino.pyopenvino import Tensor
from openvino._pyopenvino import Model
from openvino._pyopenvino import Core as CoreBase
from openvino._pyopenvino import CompiledModel as CompiledModelBase
from openvino._pyopenvino import InferRequest as InferRequestBase
from openvino._pyopenvino import AsyncInferQueue as AsyncInferQueueBase
from openvino._pyopenvino import ConstOutput
from openvino._pyopenvino import Tensor
def tensor_from_file(path: str) -> Tensor:

10
src/bindings/python/src/openvino/runtime/op/__init__.py
View File

@@ -10,7 +10,7 @@ Low level wrappers for the c++ api in ov::op.
import numpy as np
from openvino.pyopenvino.op import Constant
from openvino._pyopenvino.op import Constant
"""Retrieve Constant inner data.
@@ -20,7 +20,7 @@ from openvino.pyopenvino.op import Constant
"""
Constant.get_data = lambda self: np.array(self, copy=True)
from openvino.pyopenvino.op import Parameter
from openvino.pyopenvino.op import if_op
from openvino.pyopenvino.op import loop
from openvino.pyopenvino.op import tensor_iterator
from openvino._pyopenvino.op import Parameter
from openvino._pyopenvino.op import if_op
from openvino._pyopenvino.op import loop
from openvino._pyopenvino.op import tensor_iterator

26
src/bindings/python/src/openvino/runtime/op/util/__init__.py
View File

@@ -7,16 +7,16 @@ Low level wrappers for the c++ api in ov::op::util.
"""
# flake8: noqa
from openvino.pyopenvino.op.util import UnaryElementwiseArithmetic
from openvino.pyopenvino.op.util import BinaryElementwiseComparison
from openvino.pyopenvino.op.util import BinaryElementwiseArithmetic
from openvino.pyopenvino.op.util import BinaryElementwiseLogical
from openvino.pyopenvino.op.util import ArithmeticReduction
from openvino.pyopenvino.op.util import IndexReduction
from openvino.pyopenvino.op.util import VariableInfo
from openvino.pyopenvino.op.util import Variable
from openvino.pyopenvino.op.util import MergedInputDescription
from openvino.pyopenvino.op.util import InvariantInputDescription
from openvino.pyopenvino.op.util import SliceInputDescription
from openvino.pyopenvino.op.util import ConcatOutputDescription
from openvino.pyopenvino.op.util import BodyOutputDescription
from openvino._pyopenvino.op.util import UnaryElementwiseArithmetic
from openvino._pyopenvino.op.util import BinaryElementwiseComparison
from openvino._pyopenvino.op.util import BinaryElementwiseArithmetic
from openvino._pyopenvino.op.util import BinaryElementwiseLogical
from openvino._pyopenvino.op.util import ArithmeticReduction
from openvino._pyopenvino.op.util import IndexReduction
from openvino._pyopenvino.op.util import VariableInfo
from openvino._pyopenvino.op.util import Variable
from openvino._pyopenvino.op.util import MergedInputDescription
from openvino._pyopenvino.op.util import InvariantInputDescription
from openvino._pyopenvino.op.util import SliceInputDescription
from openvino._pyopenvino.op.util import ConcatOutputDescription
from openvino._pyopenvino.op.util import BodyOutputDescription

6
src/bindings/python/src/openvino/runtime/passes/__init__.py
View File

@@ -3,9 +3,9 @@
# type: ignore
# flake8: noqa
from openvino.pyopenvino.passes import ModelPass, Matcher, MatcherPass, PassBase, WrapType, Or, AnyInput
from openvino.pyopenvino.passes import consumers_count, has_static_dim, has_static_dims, has_static_shape,\
from openvino._pyopenvino.passes import ModelPass, Matcher, MatcherPass, PassBase, WrapType, Or, AnyInput
from openvino._pyopenvino.passes import consumers_count, has_static_dim, has_static_dims, has_static_shape,\
has_static_rank, rank_equals, type_matches, type_matches_any
from openvino.pyopenvino.passes import Serialize, ConstantFolding, VisualizeTree, MakeStateful, LowLatency2, ConvertFP32ToFP16
from openvino._pyopenvino.passes import Serialize, ConstantFolding, VisualizeTree, MakeStateful, LowLatency2, ConvertFP32ToFP16
from openvino.runtime.passes.manager import Manager
from openvino.runtime.passes.graph_rewrite import GraphRewrite, BackwardGraphRewrite

6
src/bindings/python/src/openvino/runtime/passes/graph_rewrite.py
View File

@@ -2,9 +2,9 @@
# Copyright (C) 2022 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
# type: ignore
from openvino.pyopenvino.passes import MatcherPass
from openvino.pyopenvino.passes import GraphRewrite as GraphRewriteBase
from openvino.pyopenvino.passes import BackwardGraphRewrite as BackwardGraphRewriteBase
from openvino._pyopenvino.passes import MatcherPass
from openvino._pyopenvino.passes import GraphRewrite as GraphRewriteBase
from openvino._pyopenvino.passes import BackwardGraphRewrite as BackwardGraphRewriteBase
class GraphRewrite(GraphRewriteBase):

4
src/bindings/python/src/openvino/runtime/passes/manager.py
View File

@@ -2,8 +2,8 @@
# Copyright (C) 2022 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
# type: ignore
from openvino.pyopenvino.passes import Manager as ManagerBase
from openvino.pyopenvino.passes import PassBase
from openvino._pyopenvino.passes import Manager as ManagerBase
from openvino._pyopenvino.passes import PassBase
class Manager(ManagerBase):

6
src/bindings/python/src/openvino/runtime/utils/__init__.py
View File

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

2
src/bindings/python/src/openvino/runtime/utils/node_factory.py
View File

@@ -7,7 +7,7 @@ import logging as log
from functools import partial
from typing import Any, Dict, List, Optional, Union
from openvino.pyopenvino import NodeFactory as _NodeFactory
from openvino._pyopenvino import NodeFactory as _NodeFactory
from openvino.runtime import Node, Output

2
src/bindings/python/src/openvino/utils.py
View File

@@ -42,7 +42,7 @@ def deprecated(version: str = "", message: str = "") -> Callable[..., Any]:
@wraps(wrapped)
def wrapper(*args: Any, **kwargs: Any) -> Callable[..., Any]:
# it must be imported here; otherwise, there are errors with no loaded DLL for Windows
from openvino.pyopenvino.util import deprecation_warning
from openvino._pyopenvino.util import deprecation_warning
deprecation_warning(wrapped.__name__, version, message)
return wrapped(*args, **kwargs)
return wrapper

2
src/bindings/python/src/pyopenvino/CMakeLists.txt
View File

@@ -76,7 +76,7 @@ endif()
target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
target_link_libraries(${PROJECT_NAME} PRIVATE openvino::runtime::dev openvino::runtime ${OFFLINE_TRANSFORMATIONS_LIB})
set_target_properties(${PROJECT_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
set_target_properties(${PROJECT_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO} OUTPUT_NAME "_pyopenvino")
addVersionDefines(pyopenvino.cpp CI_BUILD_NUMBER)

4
src/bindings/python/src/pyopenvino/graph/node.cpp
View File

@@ -129,7 +129,7 @@ void regclass_graph_Node(py::module m) {
:param index: Index of Input.
:type index: int
:return: Tensor of the input i
:rtype: openvino.pyopenvino.DescriptorTensor
:rtype: openvino._pyopenvino.DescriptorTensor
)");
node.def("get_element_type",
&ov::Node::get_element_type,
@@ -217,7 +217,7 @@ void regclass_graph_Node(py::module m) {
:param index: Index of the output.
:type index: int
:return: Tensor of the output i
:rtype: openvino.pyopenvino.DescriptorTensor
:rtype: openvino._pyopenvino.DescriptorTensor
)");
node.def("get_type_name",
&ov::Node::get_type_name,

2
src/bindings/python/src/pyopenvino/graph/node_input.cpp
View File

@@ -74,7 +74,7 @@ void regclass_graph_Input(py::module m) {
A reference to the tensor descriptor for this input.
:return: Tensor of the input.
:rtype: openvino.pyopenvino.DescriptorTensor
:rtype: openvino._pyopenvino.DescriptorTensor
)");
input.def("get_rt_info",
(ov::RTMap & (ov::Input<ov::Node>::*)()) & ov::Input<ov::Node>::get_rt_info,

2
src/bindings/python/src/pyopenvino/graph/node_output.hpp
View File

@@ -139,7 +139,7 @@ void regclass_graph_Output(py::module m, std::string typestring)
A reference to the tensor descriptor for this output.
:return: Tensor of the output.
:rtype: openvino.pyopenvino.DescriptorTensor
:rtype: openvino._pyopenvino.DescriptorTensor
)");
output.def("get_rt_info",
(ov::RTMap & (ov::Output<VT>::*)()) & ov::Output<VT>::get_rt_info,

6
src/bindings/python/src/pyopenvino/pyopenvino.cpp
View File

@@ -69,8 +69,8 @@ inline std::string get_version() {
return version.buildNumber;
}
PYBIND11_MODULE(pyopenvino, m) {
m.doc() = "Package openvino.pyopenvino which wraps openvino C++ APIs";
PYBIND11_MODULE(_pyopenvino, m) {
m.doc() = "Package openvino._pyopenvino which wraps openvino C++ APIs";
std::string pyopenvino_version = CI_BUILD_NUMBER;
std::string runtime_version = get_version();
bool is_custom_pyopenvino_version = pyopenvino_version.empty() || pyopenvino_version.find("custom_") == 0;
@@ -92,7 +92,7 @@ PYBIND11_MODULE(pyopenvino, m) {
m.def(
"set_batch",
[](const std::shared_ptr<ov::Model>& model, int64_t value) {
return ov::set_batch(model, ov::Dimension(value));
ov::set_batch(model, ov::Dimension(value));
},
py::arg("model"),
py::arg("batch_size") = -1);

2
src/bindings/python/tests/test_graph/test_basic.py
View File

@@ -14,7 +14,7 @@ from openvino.runtime.exceptions import UserInputError
from openvino.runtime import Model, PartialShape, Shape, Type, layout_helpers
from openvino.runtime import Strides, AxisVector, Coordinate, CoordinateDiff
from openvino.runtime import Tensor, OVAny
from openvino.pyopenvino import DescriptorTensor
from openvino._pyopenvino import DescriptorTensor
from openvino.runtime.op import Parameter
from tests.runtime import get_runtime
from openvino.runtime.utils.types import get_dtype

2
src/bindings/python/tests/test_graph/test_utils.py
View File

@@ -5,7 +5,7 @@
import numpy as np
import openvino.runtime as ov
import pytest
from openvino.pyopenvino.util import deprecation_warning
from openvino._pyopenvino.util import deprecation_warning
from openvino.runtime import Shape

2
src/bindings/python/tests/test_package_versions.py
View File

@@ -6,7 +6,7 @@ import openvino.preprocess as ov_pre
import openvino.runtime as ov_run
import openvino.frontend as ov_front
import openvino._offline_transformations as ov_off_transf
import openvino.pyopenvino as ov_py
import openvino._pyopenvino as ov_py
def test_get_version_match():

2
src/bindings/python/tests/test_runtime/test_function.py
View File

@@ -439,7 +439,7 @@ def test_reshape_with_python_types(device):
with pytest.raises(TypeError) as e:
model.reshape({model.input().node: shape10})
assert (
"Incorrect key type <class 'openvino.pyopenvino.op.Parameter'> to reshape a model, "
"Incorrect key type <class 'openvino._pyopenvino.op.Parameter'> to reshape a model, "
"expected keys as openvino.runtime.Output, int or str." in str(e.value)
)

2
src/bindings/python/tests/test_runtime/test_input_node.py
View File

@@ -6,7 +6,7 @@ import os
from ..conftest import model_path
from openvino.runtime import Input, Shape, PartialShape, Type, RTMap
from openvino.pyopenvino import DescriptorTensor
from openvino._pyopenvino import DescriptorTensor
import openvino.runtime.opset8 as ops
from openvino.runtime import Core, OVAny

2
src/bindings/python/tests/test_utils/test_utils.py
View File

@@ -47,7 +47,7 @@ def generate_relu_model(input_shape: List[int]) -> openvino.runtime.ie_api.Compi
return core.compile_model(model, "CPU", {})
def generate_add_model() -> openvino.pyopenvino.Model:
def generate_add_model() -> openvino._pyopenvino.Model:
param1 = ops.parameter(Shape([2, 1]), dtype=np.float32, name="data1")
param2 = ops.parameter(Shape([2, 1]), dtype=np.float32, name="data2")
add = ops.add(param1, param2)