From 3645730f56bf595eb73447f4ef52a47d4bcdaf5c Mon Sep 17 00:00:00 2001 From: dmitrygo Date: Thu, 2 Jan 2025 17:37:36 +0400 Subject: [PATCH] ci fixes --- src/bindings/python/src/openvino/properties/__init__.py | 1 - .../python/src/openvino/runtime/properties/__init__.py | 1 - tests/samples_tests/smoke_tests/test_benchmark_app.py | 2 +- tools/benchmark_tool/openvino/tools/benchmark/utils/utils.py | 4 +--- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/bindings/python/src/openvino/properties/__init__.py b/src/bindings/python/src/openvino/properties/__init__.py index 371660bcd9f214..8553ae56bfb3a6 100644 --- a/src/bindings/python/src/openvino/properties/__init__.py +++ b/src/bindings/python/src/openvino/properties/__init__.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # Enums -from openvino._pyopenvino.properties import Affinity from openvino._pyopenvino.properties import CacheMode from openvino._pyopenvino.properties import WorkloadType diff --git a/src/bindings/python/src/openvino/runtime/properties/__init__.py b/src/bindings/python/src/openvino/runtime/properties/__init__.py index 68758f8aaf5c25..511c019be8d969 100644 --- a/src/bindings/python/src/openvino/runtime/properties/__init__.py +++ b/src/bindings/python/src/openvino/runtime/properties/__init__.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 # Enums -from openvino._pyopenvino.properties import Affinity from openvino._pyopenvino.properties import CacheMode from openvino._pyopenvino.properties import WorkloadType diff --git a/tests/samples_tests/smoke_tests/test_benchmark_app.py b/tests/samples_tests/smoke_tests/test_benchmark_app.py index 843119e122bc4f..d19efbcebae86f 100755 --- a/tests/samples_tests/smoke_tests/test_benchmark_app.py +++ b/tests/samples_tests/smoke_tests/test_benchmark_app.py @@ -70,7 +70,7 @@ def verify(sample_language, device, api=None, nireq=None, shape=None, data_shape assert not nstreams or config_json['CPU']['NUM_STREAMS'] == nstreams assert (not pin or pin == 'YES' and config_json['CPU']['ENABLE_CPU_PINNING'] == 'YES' - or pin == 'NO' and config_json['CPU']['ENABLE_CPU_PINNING'] == 'NO' + or pin == 'NO' and config_json['CPU']['ENABLE_CPU_PINNING'] == 'NO') @pytest.mark.parametrize('sample_language', ['C++', 'Python']) diff --git a/tools/benchmark_tool/openvino/tools/benchmark/utils/utils.py b/tools/benchmark_tool/openvino/tools/benchmark/utils/utils.py index c705a3d832599d..45569c35db660e 100644 --- a/tools/benchmark_tool/openvino/tools/benchmark/utils/utils.py +++ b/tools/benchmark_tool/openvino/tools/benchmark/utils/utils.py @@ -766,8 +766,6 @@ def device_properties_to_string(config): for sk, sv in v.items(): if isinstance(sv, bool): sv = "YES" if sv else "NO" - if isinstance(sv, properties.Affinity): - sv = sv.name sub_str += "{0}:{1},".format(sk, sv) sub_str = sub_str[:-1] sub_str += "}" @@ -808,7 +806,7 @@ def dump_config(filename, config): for key, value in device_config.items(): if isinstance(value, OVAny) and (isinstance(value.value, dict)): value_string = device_properties_to_string(value.get()) - elif isinstance(value, (properties.hint.PerformanceMode, properties.Affinity)): + elif isinstance(value, properties.hint.PerformanceMode): value_string = value.name elif isinstance(value, OVAny): value_string = str(value.value)