Skip to content

Commit ec8d168

Browse files
authored
[Py OV] Update py API tests with imports from openvino directly (#28353)
### Details: - Replace 'openvino.runtime' imports with 'openvino' in _openvino/src/bindings/python/tests_ - Create a new test suite [test_deprecated_runtime.py](https://github.com/openvinotoolkit/openvino/pull/28353/files#diff-7d9fa0ff44c9ad25b02db3b6c802da86c24ac8356705496103ed9aa579b3014d) to test deprecated runtime functionality. ### Tickets: - [CVS-159527](https://jira.devtools.intel.com/browse/CVS-159527) --------- Signed-off-by: Alicja Miloszewska <[email protected]>
1 parent 93a103b commit ec8d168

File tree

88 files changed

+502
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+502
-178
lines changed

src/bindings/python/tests/test_graph/test_affix_ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77
import re
88

9-
import openvino.runtime.opset13 as ov
9+
import openvino.opset13 as ov
1010
from openvino import Type
1111

1212

src/bindings/python/tests/test_graph/test_basic.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import numpy as np
77
import pytest
88

9-
import openvino.runtime.opset8 as ops
10-
import openvino.runtime as ov
9+
import openvino.opset8 as ops
10+
import openvino as ov
1111

1212
from openvino import (
1313
Model,
@@ -20,12 +20,12 @@
2020
layout_helpers,
2121
)
2222

23-
from openvino.runtime.op import Parameter, Constant
24-
from openvino.runtime.op.util import VariableInfo, Variable
25-
from openvino.runtime import AxisVector, Coordinate, CoordinateDiff
23+
from openvino.op import Parameter, Constant
24+
from openvino.op.util import VariableInfo, Variable
25+
from openvino import AxisVector, Coordinate, CoordinateDiff
2626
from openvino._pyopenvino import DescriptorTensor
2727

28-
from openvino.runtime.utils.types import get_element_type
28+
from openvino.utils.types import get_element_type
2929
from tests.utils.helpers import generate_model_with_memory
3030

3131

src/bindings/python/tests/test_graph/test_col2im.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
from openvino import Type
6-
import openvino.runtime.opset15 as ov
6+
import openvino.opset15 as ov
77
import numpy as np
88
import pytest
99

src/bindings/python/tests/test_graph/test_constant.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import numpy as np
66
import openvino as ov
77

8-
import openvino.runtime.opset13 as ops
8+
import openvino.opset13 as ops
99
from openvino import Type, PartialShape, Model, Strides, Tensor, compile_model
10-
from openvino.runtime.op import Constant
10+
from openvino.op import Constant
1111
from openvino.helpers import pack_data, unpack_data
1212

1313
import pytest
@@ -306,7 +306,7 @@ def test_memory_sharing(shared_flag):
306306
assert not np.shares_memory(arr, ov_const.data)
307307

308308

309-
OPSETS = [ov.runtime.opset12, ov.runtime.opset13]
309+
OPSETS = [ov.opset12, ov.opset13]
310310

311311

312312
@pytest.mark.parametrize(("opset"), OPSETS)

src/bindings/python/tests/test_graph/test_convert_promote_types.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66
import pytest
77

8-
import openvino.runtime.opset14 as ops
8+
import openvino.opset14 as ops
99
from openvino import Type
1010

1111

src/bindings/python/tests/test_graph/test_convolution.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77

88
from openvino import Type
9-
import openvino.runtime.opset8 as ov
9+
import openvino.opset8 as ov
1010

1111

1212
@pytest.mark.parametrize(("strides", "pads_begin", "pads_end", "dilations", "expected_shape"), [

src/bindings/python/tests/test_graph/test_core.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from openvino import Dimension, Model, PartialShape, Shape
1111

12-
import openvino.runtime.opset8 as ov
12+
import openvino.opset8 as ov
1313

1414

1515
def test_dimension():

src/bindings/python/tests/test_graph/test_create_op.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import pytest
77

88
from openvino import PartialShape, Dimension, Model, Type
9-
from openvino.runtime.exceptions import UserInputError
10-
from openvino.runtime.utils.types import make_constant_node
11-
12-
import openvino.runtime.opset1 as ov_opset1
13-
import openvino.runtime.opset5 as ov_opset5
14-
import openvino.runtime.opset10 as ov_opset10
15-
import openvino.runtime.opset15 as ov_opset15
16-
import openvino.runtime.opset11 as ov
17-
from openvino.runtime.op.util import VariableInfo, Variable
9+
from openvino.exceptions import UserInputError
10+
from openvino.utils.types import make_constant_node
11+
12+
import openvino.opset1 as ov_opset1
13+
import openvino.opset5 as ov_opset5
14+
import openvino.opset10 as ov_opset10
15+
import openvino.opset15 as ov_opset15
16+
import openvino.opset11 as ov
17+
from openvino.op.util import VariableInfo, Variable
1818

1919
np_types = [np.float32, np.int32]
2020
integral_np_types = [

src/bindings/python/tests/test_graph/test_ctc_loss.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import numpy as np
66

7-
import openvino.runtime.opset8 as ov
7+
import openvino.opset8 as ov
88
from openvino import Type
99

1010

src/bindings/python/tests/test_graph/test_custom_op.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
from openvino import Op
1111
from openvino import CompiledModel, Model, Dimension, Shape, Tensor, compile_model, serialize
12-
from openvino.runtime import DiscreteTypeInfo
13-
import openvino.runtime.opset14 as ops
12+
from openvino import DiscreteTypeInfo
13+
import openvino.opset14 as ops
1414

1515
from tests.utils.helpers import create_filenames_for_ir
1616

src/bindings/python/tests/test_graph/test_data_movement.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66
import pytest
77

8-
import openvino.runtime.opset8 as ov
8+
import openvino.opset8 as ov
99
from openvino import Type, Shape
1010

1111

src/bindings/python/tests/test_graph/test_detection_output.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
import numpy as np
6-
import openvino.runtime.opset8 as ov
6+
import openvino.opset8 as ov
77
import pytest
88

99
np_types = [np.float32, np.int32]

src/bindings/python/tests/test_graph/test_dft.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
from openvino import Type
6-
import openvino.runtime.opset10 as ov
6+
import openvino.opset10 as ov
77
import numpy as np
88
import pytest
99

src/bindings/python/tests/test_graph/test_dyn_attributes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
import numpy as np
6-
import openvino.runtime.opset8 as ov
6+
import openvino.opset8 as ov
77
import pytest
88

99

src/bindings/python/tests/test_graph/test_einsum.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# Copyright (C) 2018-2025 Intel Corporation
33
# SPDX-License-Identifier: Apache-2.0
44

5-
import openvino.runtime.opset8 as ov
5+
import openvino.opset8 as ov
66
import numpy as np
77
import pytest
88

9-
from openvino.runtime.utils.types import get_element_type
9+
from openvino.utils.types import get_element_type
1010

1111

1212
def einsum_op_check(input_shapes: list, equation: str, data_type: np.dtype,

src/bindings/python/tests/test_graph/test_eye.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# Copyright (C) 2018-2025 Intel Corporation
33
# SPDX-License-Identifier: Apache-2.0
44

5-
import openvino.runtime.opset10 as ov
5+
import openvino.opset10 as ov
66
import numpy as np
77
import pytest
88

9-
from openvino.runtime.utils.types import get_element_type_str
10-
from openvino.runtime.utils.types import get_element_type
9+
from openvino.utils.types import get_element_type_str
10+
from openvino.utils.types import get_element_type
1111

1212

1313
@pytest.mark.parametrize(

src/bindings/python/tests/test_graph/test_fake_convert.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66
import pytest
77

8-
import openvino.runtime.opset13 as ops
8+
import openvino.opset13 as ops
99
from openvino import PartialShape, Type
1010

1111

src/bindings/python/tests/test_graph/test_gather.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
from openvino import Tensor, Type
6-
import openvino.runtime.opset8 as ov
6+
import openvino.opset8 as ov
77
import numpy as np
88
import pytest
99

src/bindings/python/tests/test_graph/test_identity.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import numpy as np
66
import pytest
77

8-
from openvino.runtime.opset15 import parameter
9-
from openvino.runtime.opset16 import identity
8+
from openvino.opset15 import parameter
9+
from openvino.opset16 import identity
1010
from openvino import PartialShape, Type
1111

1212

src/bindings/python/tests/test_graph/test_idft.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
from openvino import Type
6-
import openvino.runtime.opset8 as ov
6+
import openvino.opset8 as ov
77
import numpy as np
88
import pytest
99

src/bindings/python/tests/test_graph/test_if.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
import pytest
66
import numpy as np
7-
import openvino.runtime.opset8 as ov
7+
import openvino.opset8 as ov
88
from openvino import Model
99

10-
from openvino.runtime.op.util import InvariantInputDescription, BodyOutputDescription
10+
from openvino.op.util import InvariantInputDescription, BodyOutputDescription
1111

1212
from tests.utils.helpers import compare_models
1313

src/bindings/python/tests/test_graph/test_input_validation.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import numpy as np
66
import pytest
77

8-
from openvino.runtime.exceptions import UserInputError
9-
from openvino.runtime.utils.input_validation import (
8+
from openvino.exceptions import UserInputError
9+
from openvino.utils.input_validation import (
1010
_check_value,
1111
check_valid_attribute,
1212
check_valid_attributes,

src/bindings/python/tests/test_graph/test_inverse.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66
import pytest
77

8-
import openvino.runtime.opset14 as ops
8+
import openvino.opset14 as ops
99
from openvino import PartialShape, Type
1010

1111

src/bindings/python/tests/test_graph/test_log_softmax.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
import numpy as np
6-
import openvino.runtime.opset8 as ov
6+
import openvino.opset8 as ov
77
from openvino import Shape, Type
88

99

src/bindings/python/tests/test_graph/test_loop.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
import pytest
66
import numpy as np
7-
import openvino.runtime.opset8 as ov
7+
import openvino.opset8 as ov
88
from openvino import Model, Shape
99

10-
from openvino.runtime.op.util import (
10+
from openvino.op.util import (
1111
InvariantInputDescription,
1212
BodyOutputDescription,
1313
SliceInputDescription,

src/bindings/python/tests/test_graph/test_manager.py

+1-18
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import numpy as np
88
import pytest
99

10-
import openvino.runtime.opset10 as ops
10+
import openvino.opset10 as ops
1111
from openvino import Core, Model
1212
from openvino.passes import Manager, Serialize, ConstantFolding, Version
1313

@@ -48,23 +48,6 @@ def test_constant_folding():
4848
assert np.allclose(values_out, values_expected)
4949

5050

51-
def test_runtime_passes_manager():
52-
import openvino.runtime.passes as rt
53-
node_constant = ops.constant(np.array([[0.0, 0.1, -0.1], [-2.5, 2.5, 3.0]], dtype=np.float32))
54-
node_ceil = ops.ceiling(node_constant)
55-
model = Model(node_ceil, [], "TestModel")
56-
57-
assert count_ops_of_type(model, node_ceil) == 1
58-
assert count_ops_of_type(model, node_constant) == 1
59-
60-
pass_manager = rt.Manager()
61-
pass_manager.register_pass(rt.ConstantFolding())
62-
pass_manager.run_passes(model)
63-
64-
assert count_ops_of_type(model, node_ceil) == 0
65-
assert count_ops_of_type(model, node_constant) == 1
66-
67-
6851
# request - https://docs.pytest.org/en/7.1.x/reference/reference.html#request
6952
@pytest.fixture
7053
def prepare_ir_paths(request, tmp_path):

src/bindings/python/tests/test_graph/test_multinomial.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66
import pytest
77

8-
import openvino.runtime.opset13 as ops
8+
import openvino.opset13 as ops
99
from openvino import PartialShape, Type
1010

1111

src/bindings/python/tests/test_graph/test_nms_rotated.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import numpy as np
66
import pytest
77

8-
import openvino.runtime.opset13 as ov_opset13
8+
import openvino.opset13 as ov_opset13
99

1010
from openvino import PartialShape, Dimension, Type
11-
from openvino.runtime.utils.types import make_constant_node
11+
from openvino.utils.types import make_constant_node
1212

1313

1414
@pytest.mark.parametrize(

src/bindings/python/tests/test_graph/test_node_factory.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import pytest
77
from sys import platform
88
from openvino import compile_model, Model
9-
from openvino.runtime import Extension
10-
import openvino.runtime.opset8 as ov
11-
from openvino.runtime.exceptions import UserInputError
12-
from openvino.runtime.utils.node_factory import NodeFactory
9+
from openvino import Extension
10+
import openvino.opset8 as ov
11+
from openvino.exceptions import UserInputError
12+
from openvino.utils.node_factory import NodeFactory
1313

1414

1515
def test_node_factory_add():

src/bindings/python/tests/test_graph/test_normalization.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66

77
from openvino import Type
8-
import openvino.runtime.opset13 as ov
8+
import openvino.opset13 as ov
99

1010

1111
def test_lrn():

src/bindings/python/tests/test_graph/test_ops.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import pytest
99
from contextlib import nullcontext as does_not_raise
1010

11-
import openvino.runtime.opset8 as ov
11+
import openvino.opset8 as ov
1212
from openvino import Shape, Type
13-
from openvino.runtime import AxisSet
14-
from openvino.runtime.op import Constant, Parameter
13+
from openvino import AxisSet
14+
from openvino.op import Constant, Parameter
1515

1616

1717
@pytest.mark.parametrize(("ov_op", "expected_ov_str", "expected_type"), [

0 commit comments

Comments
 (0)