From 29f2ef12bceaf2f43612134056617adb1ec17f7c Mon Sep 17 00:00:00 2001 From: Alexander Dokuchaev Date: Sun, 9 Feb 2025 20:06:39 +0200 Subject: [PATCH 1/4] ov import --- README.md | 2 +- nncf/common/utils/backend.py | 4 ++-- nncf/openvino/engine.py | 2 +- nncf/openvino/graph/metatypes/openvino_metatypes.py | 2 +- nncf/openvino/graph/model_builder.py | 2 +- nncf/openvino/graph/model_transformer.py | 2 +- nncf/openvino/graph/model_utils.py | 2 +- nncf/openvino/graph/nncf_graph_builder.py | 2 +- nncf/openvino/graph/node_utils.py | 2 +- nncf/openvino/graph/transformations/commands.py | 2 +- nncf/openvino/quantization/quantize_ifmodel.py | 2 +- nncf/openvino/quantization/quantize_model.py | 2 +- nncf/openvino/rt_info.py | 2 +- nncf/openvino/statistics/aggregator.py | 2 +- .../algorithms/accuracy_control/openvino_backend.py | 2 +- .../algorithms/bias_correction/openvino_backend.py | 2 +- .../algorithms/channel_alignment/openvino_backend.py | 2 +- .../algorithms/fast_bias_correction/openvino_backend.py | 2 +- nncf/quantization/algorithms/layerwise/openvino_backend.py | 2 +- nncf/quantization/algorithms/layerwise/openvino_iterator.py | 2 +- nncf/quantization/algorithms/smooth_quant/openvino_backend.py | 2 +- tests/cross_fw/sdl/fuzz/quantize_api.py | 2 +- tests/onnx/quantization/test_ptq_regression.py | 2 +- tests/openvino/native/models.py | 2 +- .../native/quantization/test_quantization_pipeline.py | 2 +- tests/openvino/native/quantization/test_quantizer_removal.py | 2 +- .../openvino/native/quantization/test_weights_compression.py | 2 +- tests/openvino/native/test_layer_attributes.py | 2 +- tests/openvino/native/test_model_builder.py | 2 +- tests/openvino/native/test_model_transformer.py | 2 +- tests/openvino/native/test_node_utils.py | 2 +- tests/openvino/native/test_statistics_aggregator.py | 2 +- tests/openvino/test_transform_fn.py | 2 +- tests/openvino/tools/calibrate.py | 2 +- tests/post_training/pipelines/causal_language_model.py | 2 +- tests/post_training/pipelines/gpt.py | 2 +- tests/torch/fx/test_smooth_quant.py | 2 +- tests/torch/ptq/test_smooth_quant.py | 2 +- tools/get_ir_ignored_scope_by_model_id.py | 2 +- 39 files changed, 40 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 32ee76e4106..234d898a9f5 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ The NNCF PTQ is the simplest way to apply 8-bit quantization. To run the algorit ```python import nncf -import openvino.runtime as ov +import openvino as ov import torch from torchvision import datasets, transforms diff --git a/nncf/common/utils/backend.py b/nncf/common/utils/backend.py index 6963f12abc9..67fcc917790 100644 --- a/nncf/common/utils/backend.py +++ b/nncf/common/utils/backend.py @@ -111,7 +111,7 @@ def is_openvino_model(model: Any) -> bool: :param model: A target model. :return: True if the model is an instance of openvino.runtime.Model, otherwise False. """ - import openvino.runtime as ov # type: ignore + import openvino as ov # type: ignore return isinstance(model, ov.Model) @@ -124,7 +124,7 @@ def is_openvino_compiled_model(model: Any) -> bool: :param model: A target model. :return: True if the model is an instance of openvino.runtime.CompiledModel, otherwise False. """ - import openvino.runtime as ov + import openvino as ov return isinstance(model, ov.CompiledModel) diff --git a/nncf/openvino/engine.py b/nncf/openvino/engine.py index 56c86bcb696..b94e11fa14e 100644 --- a/nncf/openvino/engine.py +++ b/nncf/openvino/engine.py @@ -12,7 +12,7 @@ from typing import Dict, List, Tuple, Union import numpy as np -import openvino.runtime as ov +import openvino as ov from openvino import Type from openvino.properties.hint import inference_precision diff --git a/nncf/openvino/graph/metatypes/openvino_metatypes.py b/nncf/openvino/graph/metatypes/openvino_metatypes.py index 9c6909c7b30..f940d3032c3 100644 --- a/nncf/openvino/graph/metatypes/openvino_metatypes.py +++ b/nncf/openvino/graph/metatypes/openvino_metatypes.py @@ -12,7 +12,7 @@ from collections import deque from typing import List, Optional, Type -import openvino.runtime as ov +import openvino as ov import nncf from nncf.common.graph.operator_metatypes import INPUT_NOOP_METATYPES diff --git a/nncf/openvino/graph/model_builder.py b/nncf/openvino/graph/model_builder.py index 44b79833afa..f8a8b66b886 100644 --- a/nncf/openvino/graph/model_builder.py +++ b/nncf/openvino/graph/model_builder.py @@ -11,7 +11,7 @@ from collections import deque from typing import Dict, List, Tuple -import openvino.runtime as ov +import openvino as ov from openvino.runtime import opset13 as opset from openvino.runtime.utils.node_factory import NodeFactory diff --git a/nncf/openvino/graph/model_transformer.py b/nncf/openvino/graph/model_transformer.py index 389c6529263..798a360eb73 100644 --- a/nncf/openvino/graph/model_transformer.py +++ b/nncf/openvino/graph/model_transformer.py @@ -14,7 +14,7 @@ from typing import Callable, Dict, List, Tuple import numpy as np -import openvino.runtime as ov +import openvino as ov from openvino._pyopenvino import DescriptorTensor from openvino.runtime import opset13 as opset diff --git a/nncf/openvino/graph/model_utils.py b/nncf/openvino/graph/model_utils.py index 3e43626393a..65da564717b 100644 --- a/nncf/openvino/graph/model_utils.py +++ b/nncf/openvino/graph/model_utils.py @@ -11,7 +11,7 @@ from collections import deque from typing import List -import openvino.runtime as ov +import openvino as ov from nncf.common.factory import ModelTransformerFactory from nncf.common.graph.graph import NNCFGraph diff --git a/nncf/openvino/graph/nncf_graph_builder.py b/nncf/openvino/graph/nncf_graph_builder.py index a4df03ccd7e..ffff34f630f 100644 --- a/nncf/openvino/graph/nncf_graph_builder.py +++ b/nncf/openvino/graph/nncf_graph_builder.py @@ -12,7 +12,7 @@ from collections import defaultdict from typing import List, Type -import openvino.runtime as ov +import openvino as ov from nncf.common.graph import NNCFGraph from nncf.common.graph.layer_attributes import Dtype diff --git a/nncf/openvino/graph/node_utils.py b/nncf/openvino/graph/node_utils.py index 0eeaf5c956f..18c22941f8d 100644 --- a/nncf/openvino/graph/node_utils.py +++ b/nncf/openvino/graph/node_utils.py @@ -12,7 +12,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Type import numpy as np -import openvino.runtime as ov +import openvino as ov import openvino.runtime.op as op import openvino.runtime.opset13 as opset diff --git a/nncf/openvino/graph/transformations/commands.py b/nncf/openvino/graph/transformations/commands.py index 015aa5570cc..48f637a7554 100644 --- a/nncf/openvino/graph/transformations/commands.py +++ b/nncf/openvino/graph/transformations/commands.py @@ -12,7 +12,7 @@ from typing import List, Optional, Tuple import numpy as np -import openvino.runtime as ov +import openvino as ov from nncf.common.graph.transformations.commands import Command from nncf.common.graph.transformations.commands import TargetPoint diff --git a/nncf/openvino/quantization/quantize_ifmodel.py b/nncf/openvino/quantization/quantize_ifmodel.py index e9dbfb57087..5e9419514b1 100644 --- a/nncf/openvino/quantization/quantize_ifmodel.py +++ b/nncf/openvino/quantization/quantize_ifmodel.py @@ -12,7 +12,7 @@ from itertools import islice from typing import Dict, List, Optional, Tuple -import openvino.runtime as ov +import openvino as ov from nncf import Dataset from nncf.common import factory diff --git a/nncf/openvino/quantization/quantize_model.py b/nncf/openvino/quantization/quantize_model.py index 423cc026a5e..ed69a0cac08 100644 --- a/nncf/openvino/quantization/quantize_model.py +++ b/nncf/openvino/quantization/quantize_model.py @@ -13,7 +13,7 @@ from pathlib import Path from typing import Any, Callable, Iterable, List, Optional, Tuple, TypeVar, Union -import openvino.runtime as ov +import openvino as ov from openvino._offline_transformations import compress_quantize_weights_transformation from nncf.common.factory import NNCFGraphFactory diff --git a/nncf/openvino/rt_info.py b/nncf/openvino/rt_info.py index 90e202afe04..d56636612f6 100644 --- a/nncf/openvino/rt_info.py +++ b/nncf/openvino/rt_info.py @@ -12,7 +12,7 @@ from dataclasses import asdict from typing import Any, Dict, List, Optional -import openvino.runtime as ov +import openvino as ov from nncf.common.logging import nncf_logger from nncf.scopes import IgnoredScope diff --git a/nncf/openvino/statistics/aggregator.py b/nncf/openvino/statistics/aggregator.py index 13d564c08e5..64203778d84 100644 --- a/nncf/openvino/statistics/aggregator.py +++ b/nncf/openvino/statistics/aggregator.py @@ -13,7 +13,7 @@ from typing import Dict import numpy as np -import openvino.runtime as ov +import openvino as ov from nncf.common.graph.graph import NNCFGraph from nncf.common.graph.transformations.commands import TargetType diff --git a/nncf/quantization/algorithms/accuracy_control/openvino_backend.py b/nncf/quantization/algorithms/accuracy_control/openvino_backend.py index 2b319fb2684..c240b6319da 100644 --- a/nncf/quantization/algorithms/accuracy_control/openvino_backend.py +++ b/nncf/quantization/algorithms/accuracy_control/openvino_backend.py @@ -12,7 +12,7 @@ from typing import List, Optional import numpy as np -import openvino.runtime as ov +import openvino as ov from openvino import Type from openvino.properties.hint import inference_precision diff --git a/nncf/quantization/algorithms/bias_correction/openvino_backend.py b/nncf/quantization/algorithms/bias_correction/openvino_backend.py index b8763df0f98..3e0a92c0933 100644 --- a/nncf/quantization/algorithms/bias_correction/openvino_backend.py +++ b/nncf/quantization/algorithms/bias_correction/openvino_backend.py @@ -11,7 +11,7 @@ from typing import Dict, Optional, Set, Tuple -import openvino.runtime as ov +import openvino as ov from nncf.common.graph import NNCFGraph from nncf.common.graph import NNCFNode diff --git a/nncf/quantization/algorithms/channel_alignment/openvino_backend.py b/nncf/quantization/algorithms/channel_alignment/openvino_backend.py index ad1977cb671..ed0b4469083 100644 --- a/nncf/quantization/algorithms/channel_alignment/openvino_backend.py +++ b/nncf/quantization/algorithms/channel_alignment/openvino_backend.py @@ -12,7 +12,7 @@ from typing import Any, Tuple import numpy as np -import openvino.runtime as ov +import openvino as ov import nncf from nncf.common.graph import NNCFGraph diff --git a/nncf/quantization/algorithms/fast_bias_correction/openvino_backend.py b/nncf/quantization/algorithms/fast_bias_correction/openvino_backend.py index 9aae9ef2125..539a959ba53 100644 --- a/nncf/quantization/algorithms/fast_bias_correction/openvino_backend.py +++ b/nncf/quantization/algorithms/fast_bias_correction/openvino_backend.py @@ -12,7 +12,7 @@ from typing import Dict, List, Optional, Tuple import numpy as np -import openvino.runtime as ov +import openvino as ov from nncf.common.graph import NNCFGraph from nncf.common.graph import NNCFNode diff --git a/nncf/quantization/algorithms/layerwise/openvino_backend.py b/nncf/quantization/algorithms/layerwise/openvino_backend.py index e82242807ba..5daf3e228ab 100644 --- a/nncf/quantization/algorithms/layerwise/openvino_backend.py +++ b/nncf/quantization/algorithms/layerwise/openvino_backend.py @@ -11,7 +11,7 @@ from typing import Dict, List, Optional -import openvino.runtime as ov +import openvino as ov from nncf.common.graph import NNCFGraph from nncf.common.graph.transformations.commands import TargetType diff --git a/nncf/quantization/algorithms/layerwise/openvino_iterator.py b/nncf/quantization/algorithms/layerwise/openvino_iterator.py index 41310bdab5e..67160c979af 100644 --- a/nncf/quantization/algorithms/layerwise/openvino_iterator.py +++ b/nncf/quantization/algorithms/layerwise/openvino_iterator.py @@ -13,7 +13,7 @@ from itertools import islice from typing import Dict, List, Optional, Tuple -import openvino.runtime as ov +import openvino as ov from nncf.common.graph import NNCFGraph from nncf.common.graph import NNCFNode diff --git a/nncf/quantization/algorithms/smooth_quant/openvino_backend.py b/nncf/quantization/algorithms/smooth_quant/openvino_backend.py index a75f3b63794..d61618eb116 100644 --- a/nncf/quantization/algorithms/smooth_quant/openvino_backend.py +++ b/nncf/quantization/algorithms/smooth_quant/openvino_backend.py @@ -12,7 +12,7 @@ from typing import Callable, List, Tuple import numpy as np -import openvino.runtime as ov +import openvino as ov import nncf from nncf.common.graph import NNCFGraph diff --git a/tests/cross_fw/sdl/fuzz/quantize_api.py b/tests/cross_fw/sdl/fuzz/quantize_api.py index 70ae34fa7f0..69b29c08994 100644 --- a/tests/cross_fw/sdl/fuzz/quantize_api.py +++ b/tests/cross_fw/sdl/fuzz/quantize_api.py @@ -20,7 +20,7 @@ from random import randint from random import seed -import openvino.runtime as ov +import openvino as ov import torch from torchvision import datasets from torchvision import transforms diff --git a/tests/onnx/quantization/test_ptq_regression.py b/tests/onnx/quantization/test_ptq_regression.py index 61a2798e1a9..04ca99a6148 100644 --- a/tests/onnx/quantization/test_ptq_regression.py +++ b/tests/onnx/quantization/test_ptq_regression.py @@ -12,7 +12,7 @@ import numpy as np import onnx -import openvino.runtime as ov +import openvino as ov import pytest import torch from fastdownload import FastDownload diff --git a/tests/openvino/native/models.py b/tests/openvino/native/models.py index d35ec98ed59..0f113f07db4 100644 --- a/tests/openvino/native/models.py +++ b/tests/openvino/native/models.py @@ -15,7 +15,7 @@ from typing import Callable, Optional, Tuple import numpy as np -import openvino.runtime as ov +import openvino as ov from openvino.runtime import opset13 as opset from nncf.common.utils.registry import Registry diff --git a/tests/openvino/native/quantization/test_quantization_pipeline.py b/tests/openvino/native/quantization/test_quantization_pipeline.py index 5713a8ca927..da3438d184d 100644 --- a/tests/openvino/native/quantization/test_quantization_pipeline.py +++ b/tests/openvino/native/quantization/test_quantization_pipeline.py @@ -10,7 +10,7 @@ # limitations under the License. import numpy as np -import openvino.runtime as ov +import openvino as ov import pytest import nncf diff --git a/tests/openvino/native/quantization/test_quantizer_removal.py b/tests/openvino/native/quantization/test_quantizer_removal.py index 0e386d6b80b..b6c0bec9842 100644 --- a/tests/openvino/native/quantization/test_quantizer_removal.py +++ b/tests/openvino/native/quantization/test_quantizer_removal.py @@ -12,7 +12,7 @@ from dataclasses import dataclass from typing import List -import openvino.runtime as ov +import openvino as ov import pytest from nncf.common.factory import NNCFGraphFactory diff --git a/tests/openvino/native/quantization/test_weights_compression.py b/tests/openvino/native/quantization/test_weights_compression.py index 0a2adc6dd85..807701cb685 100644 --- a/tests/openvino/native/quantization/test_weights_compression.py +++ b/tests/openvino/native/quantization/test_weights_compression.py @@ -14,7 +14,7 @@ from typing import Callable, List import numpy as np -import openvino.runtime as ov +import openvino as ov import pandas as pd import pytest from attr import dataclass diff --git a/tests/openvino/native/test_layer_attributes.py b/tests/openvino/native/test_layer_attributes.py index 66c942eaed0..2b92c0a5641 100644 --- a/tests/openvino/native/test_layer_attributes.py +++ b/tests/openvino/native/test_layer_attributes.py @@ -13,7 +13,7 @@ from typing import Callable, Tuple import numpy as np -import openvino.runtime as ov +import openvino as ov import pytest from openvino.runtime import opset13 as opset diff --git a/tests/openvino/native/test_model_builder.py b/tests/openvino/native/test_model_builder.py index a223b258ad5..0358feda33c 100644 --- a/tests/openvino/native/test_model_builder.py +++ b/tests/openvino/native/test_model_builder.py @@ -11,7 +11,7 @@ from pathlib import Path -import openvino.runtime as ov +import openvino as ov import pytest from nncf.openvino.graph.model_builder import OVModelBuilder diff --git a/tests/openvino/native/test_model_transformer.py b/tests/openvino/native/test_model_transformer.py index a09b6050e38..a5585b4332d 100644 --- a/tests/openvino/native/test_model_transformer.py +++ b/tests/openvino/native/test_model_transformer.py @@ -14,7 +14,7 @@ from typing import Callable, List, Tuple import numpy as np -import openvino.runtime as ov +import openvino as ov import pytest from openvino.runtime import opset13 as opset diff --git a/tests/openvino/native/test_node_utils.py b/tests/openvino/native/test_node_utils.py index bcec4f22fc9..a9318f65d9d 100644 --- a/tests/openvino/native/test_node_utils.py +++ b/tests/openvino/native/test_node_utils.py @@ -10,7 +10,7 @@ # limitations under the License. import numpy as np -import openvino.runtime as ov +import openvino as ov import pytest from openvino.runtime import opset13 as opset diff --git a/tests/openvino/native/test_statistics_aggregator.py b/tests/openvino/native/test_statistics_aggregator.py index 753204f6bee..c4cb0a68d58 100644 --- a/tests/openvino/native/test_statistics_aggregator.py +++ b/tests/openvino/native/test_statistics_aggregator.py @@ -12,7 +12,7 @@ from typing import List, Type import numpy as np -import openvino.runtime as ov +import openvino as ov import pytest from openvino.runtime import opset13 as opset diff --git a/tests/openvino/test_transform_fn.py b/tests/openvino/test_transform_fn.py index d9010cf46e0..b85d96e32a7 100644 --- a/tests/openvino/test_transform_fn.py +++ b/tests/openvino/test_transform_fn.py @@ -10,7 +10,7 @@ # limitations under the License. import numpy as np -import openvino.runtime as ov +import openvino as ov import pytest import nncf diff --git a/tests/openvino/tools/calibrate.py b/tests/openvino/tools/calibrate.py index 4d45cb4a385..9388df93ba4 100644 --- a/tests/openvino/tools/calibrate.py +++ b/tests/openvino/tools/calibrate.py @@ -27,7 +27,7 @@ from typing import Any, Dict, Iterable, List, Optional, TypeVar import numpy as np -import openvino.runtime as ov +import openvino as ov import pkg_resources from config import Config from openvino.runtime import Dimension diff --git a/tests/post_training/pipelines/causal_language_model.py b/tests/post_training/pipelines/causal_language_model.py index 38b8e7180b0..5d32fc1bd72 100644 --- a/tests/post_training/pipelines/causal_language_model.py +++ b/tests/post_training/pipelines/causal_language_model.py @@ -10,7 +10,7 @@ # limitations under the License. -import openvino.runtime as ov +import openvino as ov import transformers from optimum.intel import OVQuantizer from optimum.intel.openvino import OVModelForCausalLM diff --git a/tests/post_training/pipelines/gpt.py b/tests/post_training/pipelines/gpt.py index d1acf0c5721..47bde50299d 100644 --- a/tests/post_training/pipelines/gpt.py +++ b/tests/post_training/pipelines/gpt.py @@ -11,7 +11,7 @@ import numpy as np -import openvino.runtime as ov +import openvino as ov import torch import transformers from optimum.intel import OVQuantizer diff --git a/tests/torch/fx/test_smooth_quant.py b/tests/torch/fx/test_smooth_quant.py index a2132e15881..aa40240efe5 100644 --- a/tests/torch/fx/test_smooth_quant.py +++ b/tests/torch/fx/test_smooth_quant.py @@ -12,7 +12,7 @@ from typing import Any, Callable, Dict, Type import numpy as np -import openvino.runtime as ov +import openvino as ov import pytest import torch diff --git a/tests/torch/ptq/test_smooth_quant.py b/tests/torch/ptq/test_smooth_quant.py index f56b3887438..3ac7d7280bc 100644 --- a/tests/torch/ptq/test_smooth_quant.py +++ b/tests/torch/ptq/test_smooth_quant.py @@ -12,7 +12,7 @@ from typing import Callable, Dict, Type import numpy as np -import openvino.runtime as ov +import openvino as ov import pytest import torch diff --git a/tools/get_ir_ignored_scope_by_model_id.py b/tools/get_ir_ignored_scope_by_model_id.py index 780bfaa83e2..7e379151e5b 100644 --- a/tools/get_ir_ignored_scope_by_model_id.py +++ b/tools/get_ir_ignored_scope_by_model_id.py @@ -13,7 +13,7 @@ from argparse import ArgumentParser from typing import List, Optional -import openvino.runtime as ov +import openvino as ov def print_ignored_scope_by_model_name(model_name: str, xml_path: str, bin_path: str) -> None: From aac7b2b4477f743e048baceafa99ea64b7311503 Mon Sep 17 00:00:00 2001 From: Alexander Dokuchaev Date: Sun, 9 Feb 2025 20:22:10 +0200 Subject: [PATCH 2/4] doc --- nncf/openvino/graph/model_builder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nncf/openvino/graph/model_builder.py b/nncf/openvino/graph/model_builder.py index f8a8b66b886..0c7c5f99f79 100644 --- a/nncf/openvino/graph/model_builder.py +++ b/nncf/openvino/graph/model_builder.py @@ -59,14 +59,14 @@ def _collect_graph_nodes( output_ids: List[Tuple[str, int]], node_mapping: Dict[str, ov.Node], ) -> List[ov.Node]: - """ + r""" A method for aggregating layers to be further cloned. Aggregation is designed in such a way that layers are listed from right to left, as they pass from bottom to top. This is done in order to find all constants in the model and to start graph creation from them (as well as Parameter layers), because OpenVINO graph is created from top-down and cannot be created otherwise. - Legend: w - weigths, c - convert, il/ih - input low/high, ol/oh - output low/high + Legend: w - weights, c - convert, il/ih - input low/high, ol/oh - output low/high (w) | (c) (il) (ih) (ol) (oh) @@ -115,11 +115,11 @@ def build( output_ids: List[Tuple[str, int]], node_mapping: Dict[str, ov.Node], ) -> ov.Model: - """ + r""" The basic method of the algorithm. This method uses an aggregated list of layers to be recreated. Let us take a graph of this kind as an example: - Legend: w - weigths, c - convert, il/ih - input low/high, ol/oh - output low/high + Legend: w - weights, c - convert, il/ih - input low/high, ol/oh - output low/high (w) | (c) (il) (ih) (ol) (oh) From 8c5f95433e912aad6901b5a81d09478b4b4bd8cb Mon Sep 17 00:00:00 2001 From: Alexander Dokuchaev Date: Sun, 9 Feb 2025 20:34:51 +0200 Subject: [PATCH 3/4] runtime --- nncf/common/utils/backend.py | 8 ++++---- nncf/openvino/graph/model_builder.py | 4 ++-- nncf/openvino/graph/model_transformer.py | 2 +- nncf/openvino/graph/node_utils.py | 4 ++-- nncf/openvino/optimized_functions/models.py | 4 ++-- .../algorithms/weight_compression/openvino_backend.py | 2 +- tests/onnx/quantization/test_ptq_regression.py | 2 +- tests/openvino/native/models.py | 2 +- .../openvino/native/quantization/test_quantize_api.py | 10 +++++----- .../quantization/test_reducers_and_aggregators.py | 2 +- .../native/quantization/test_weights_compression.py | 2 +- tests/openvino/native/test_layer_attributes.py | 2 +- tests/openvino/native/test_model_transformer.py | 2 +- tests/openvino/native/test_node_utils.py | 2 +- tests/openvino/native/test_statistics_aggregator.py | 2 +- tests/openvino/native/test_tensor.py | 2 +- tests/openvino/test_telemetry.py | 10 +++++----- tests/openvino/tools/calibrate.py | 4 ++-- tests/torch/sparsity/movement/test_model_saving.py | 4 ++-- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/nncf/common/utils/backend.py b/nncf/common/utils/backend.py index 67fcc917790..fd3b8fef93e 100644 --- a/nncf/common/utils/backend.py +++ b/nncf/common/utils/backend.py @@ -106,10 +106,10 @@ def is_onnx_model(model: Any) -> bool: @result_verifier def is_openvino_model(model: Any) -> bool: """ - Returns True if the model is an instance of openvino.runtime.Model, otherwise False. + Returns True if the model is an instance of openvino.Model, otherwise False. :param model: A target model. - :return: True if the model is an instance of openvino.runtime.Model, otherwise False. + :return: True if the model is an instance of openvino.Model, otherwise False. """ import openvino as ov # type: ignore @@ -119,10 +119,10 @@ def is_openvino_model(model: Any) -> bool: @result_verifier def is_openvino_compiled_model(model: Any) -> bool: """ - Returns True if the model is an instance of openvino.runtime.CompiledModel, otherwise False. + Returns True if the model is an instance of openvino.CompiledModel, otherwise False. :param model: A target model. - :return: True if the model is an instance of openvino.runtime.CompiledModel, otherwise False. + :return: True if the model is an instance of openvino.CompiledModel, otherwise False. """ import openvino as ov diff --git a/nncf/openvino/graph/model_builder.py b/nncf/openvino/graph/model_builder.py index 0c7c5f99f79..31f9350813f 100644 --- a/nncf/openvino/graph/model_builder.py +++ b/nncf/openvino/graph/model_builder.py @@ -12,8 +12,8 @@ from typing import Dict, List, Tuple import openvino as ov -from openvino.runtime import opset13 as opset -from openvino.runtime.utils.node_factory import NodeFactory +from openvino import opset13 as opset +from openvino.utils.node_factory import NodeFactory from nncf.openvino.graph.model_transformer import OVModelTransformer from nncf.openvino.graph.node_utils import get_parameter_node_name diff --git a/nncf/openvino/graph/model_transformer.py b/nncf/openvino/graph/model_transformer.py index 798a360eb73..f7fe2263732 100644 --- a/nncf/openvino/graph/model_transformer.py +++ b/nncf/openvino/graph/model_transformer.py @@ -15,8 +15,8 @@ import numpy as np import openvino as ov +from openvino import opset13 as opset from openvino._pyopenvino import DescriptorTensor -from openvino.runtime import opset13 as opset import nncf from nncf.common.graph.model_transformer import ModelTransformer diff --git a/nncf/openvino/graph/node_utils.py b/nncf/openvino/graph/node_utils.py index 18c22941f8d..2f72f98944d 100644 --- a/nncf/openvino/graph/node_utils.py +++ b/nncf/openvino/graph/node_utils.py @@ -13,8 +13,8 @@ import numpy as np import openvino as ov -import openvino.runtime.op as op -import openvino.runtime.opset13 as opset +import openvino.op as op +import openvino.opset13 as opset import nncf from nncf.common.graph.graph import NNCFGraph diff --git a/nncf/openvino/optimized_functions/models.py b/nncf/openvino/optimized_functions/models.py index b2e15fdc93b..e7f87c61311 100644 --- a/nncf/openvino/optimized_functions/models.py +++ b/nncf/openvino/optimized_functions/models.py @@ -17,10 +17,10 @@ import numpy as np import openvino as ov +from openvino import Node +from openvino import opset13 as opset from openvino._pyopenvino.op import Parameter from openvino._pyopenvino.properties.hint import inference_precision -from openvino.runtime import Node -from openvino.runtime import opset13 as opset from nncf.common.utils.backend import is_openvino_at_least from nncf.common.utils.caching import ResultsCache diff --git a/nncf/quantization/algorithms/weight_compression/openvino_backend.py b/nncf/quantization/algorithms/weight_compression/openvino_backend.py index 81212bb36fa..4e21a978020 100644 --- a/nncf/quantization/algorithms/weight_compression/openvino_backend.py +++ b/nncf/quantization/algorithms/weight_compression/openvino_backend.py @@ -11,7 +11,7 @@ from typing import Callable, Dict, Iterable, List, Optional, Tuple import openvino as ov -from openvino.runtime import opset13 as opset +from openvino import opset13 as opset import nncf from nncf.common.graph import NNCFGraph diff --git a/tests/onnx/quantization/test_ptq_regression.py b/tests/onnx/quantization/test_ptq_regression.py index 04ca99a6148..5b7b946055f 100644 --- a/tests/onnx/quantization/test_ptq_regression.py +++ b/tests/onnx/quantization/test_ptq_regression.py @@ -17,7 +17,7 @@ import torch from fastdownload import FastDownload from onnx import version_converter -from openvino.runtime import Core +from openvino import Core from sklearn.metrics import accuracy_score from torchvision import datasets from torchvision import transforms diff --git a/tests/openvino/native/models.py b/tests/openvino/native/models.py index 0f113f07db4..642a9217a1f 100644 --- a/tests/openvino/native/models.py +++ b/tests/openvino/native/models.py @@ -16,7 +16,7 @@ import numpy as np import openvino as ov -from openvino.runtime import opset13 as opset +from openvino import opset13 as opset from nncf.common.utils.registry import Registry from tests.torch.test_models.inceptionv3 import inception_v3 diff --git a/tests/openvino/native/quantization/test_quantize_api.py b/tests/openvino/native/quantization/test_quantize_api.py index 589200394ea..0f669ddd102 100644 --- a/tests/openvino/native/quantization/test_quantize_api.py +++ b/tests/openvino/native/quantization/test_quantize_api.py @@ -9,11 +9,11 @@ # See the License for the specific language governing permissions and # limitations under the License. import pytest -from openvino.runtime import Model -from openvino.runtime import Shape -from openvino.runtime import Type -from openvino.runtime import op -from openvino.runtime import opset13 as opset +from openvino import Model +from openvino import Shape +from openvino import Type +from openvino import op +from openvino import opset13 as opset import nncf from nncf import Dataset diff --git a/tests/openvino/native/quantization/test_reducers_and_aggregators.py b/tests/openvino/native/quantization/test_reducers_and_aggregators.py index c9f6fdb90e3..97eb65daa24 100644 --- a/tests/openvino/native/quantization/test_reducers_and_aggregators.py +++ b/tests/openvino/native/quantization/test_reducers_and_aggregators.py @@ -13,7 +13,7 @@ import numpy as np import openvino as ov -import openvino.runtime.opset13 as opset +import openvino.opset13 as opset import pytest from nncf.common.graph.layer_attributes import Dtype diff --git a/tests/openvino/native/quantization/test_weights_compression.py b/tests/openvino/native/quantization/test_weights_compression.py index 807701cb685..fbeaf46a6c4 100644 --- a/tests/openvino/native/quantization/test_weights_compression.py +++ b/tests/openvino/native/quantization/test_weights_compression.py @@ -18,7 +18,7 @@ import pandas as pd import pytest from attr import dataclass -from openvino.runtime import opset13 as opset +from openvino import opset13 as opset import nncf from nncf import CompressWeightsMode diff --git a/tests/openvino/native/test_layer_attributes.py b/tests/openvino/native/test_layer_attributes.py index 2b92c0a5641..6f576945638 100644 --- a/tests/openvino/native/test_layer_attributes.py +++ b/tests/openvino/native/test_layer_attributes.py @@ -15,7 +15,7 @@ import numpy as np import openvino as ov import pytest -from openvino.runtime import opset13 as opset +from openvino import opset13 as opset from nncf.common.graph.layer_attributes import ConvolutionLayerAttributes from nncf.common.graph.layer_attributes import GenericWeightedLayerAttributes diff --git a/tests/openvino/native/test_model_transformer.py b/tests/openvino/native/test_model_transformer.py index a5585b4332d..d30b642c624 100644 --- a/tests/openvino/native/test_model_transformer.py +++ b/tests/openvino/native/test_model_transformer.py @@ -16,7 +16,7 @@ import numpy as np import openvino as ov import pytest -from openvino.runtime import opset13 as opset +from openvino import opset13 as opset import nncf from nncf.common.graph.transformations.commands import TargetType diff --git a/tests/openvino/native/test_node_utils.py b/tests/openvino/native/test_node_utils.py index a9318f65d9d..cc4d28f0e21 100644 --- a/tests/openvino/native/test_node_utils.py +++ b/tests/openvino/native/test_node_utils.py @@ -12,7 +12,7 @@ import numpy as np import openvino as ov import pytest -from openvino.runtime import opset13 as opset +from openvino import opset13 as opset from nncf.common.graph.graph import NNCFNode from nncf.common.utils.os import is_macos diff --git a/tests/openvino/native/test_statistics_aggregator.py b/tests/openvino/native/test_statistics_aggregator.py index c4cb0a68d58..9d5019f42ec 100644 --- a/tests/openvino/native/test_statistics_aggregator.py +++ b/tests/openvino/native/test_statistics_aggregator.py @@ -14,7 +14,7 @@ import numpy as np import openvino as ov import pytest -from openvino.runtime import opset13 as opset +from openvino import opset13 as opset from nncf import Dataset from nncf.common.graph.transformations.commands import TargetPoint diff --git a/tests/openvino/native/test_tensor.py b/tests/openvino/native/test_tensor.py index 58df3d19204..c158d7e876e 100644 --- a/tests/openvino/native/test_tensor.py +++ b/tests/openvino/native/test_tensor.py @@ -11,7 +11,7 @@ import numpy as np import openvino as ov -import openvino.runtime.opset13 as opset +import openvino.opset13 as opset import pytest import nncf.tensor.functions as fns diff --git a/tests/openvino/test_telemetry.py b/tests/openvino/test_telemetry.py index 3f199e5e3a3..ab6d8fbe93e 100644 --- a/tests/openvino/test_telemetry.py +++ b/tests/openvino/test_telemetry.py @@ -8,11 +8,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from openvino.runtime import Model -from openvino.runtime import Shape -from openvino.runtime import Type -from openvino.runtime import op -from openvino.runtime import opset13 as opset +from openvino import Model +from openvino import Shape +from openvino import Type +from openvino import op +from openvino import opset13 as opset import nncf from nncf import Dataset diff --git a/tests/openvino/tools/calibrate.py b/tests/openvino/tools/calibrate.py index 9388df93ba4..fd8a75c6236 100644 --- a/tests/openvino/tools/calibrate.py +++ b/tests/openvino/tools/calibrate.py @@ -30,8 +30,8 @@ import openvino as ov import pkg_resources from config import Config -from openvino.runtime import Dimension -from openvino.runtime import PartialShape +from openvino import Dimension +from openvino import PartialShape try: from accuracy_checker.evaluators.quantization_model_evaluator import ModelEvaluator diff --git a/tests/torch/sparsity/movement/test_model_saving.py b/tests/torch/sparsity/movement/test_model_saving.py index d6384ae7e00..e6daf906f79 100644 --- a/tests/torch/sparsity/movement/test_model_saving.py +++ b/tests/torch/sparsity/movement/test_model_saving.py @@ -20,11 +20,11 @@ from addict import Dict from datasets import Dataset from onnx import numpy_helper +from openvino import Core +from openvino import serialize from openvino._offline_transformations import apply_fused_names_cleanup from openvino._offline_transformations import apply_moc_transformations from openvino._offline_transformations import apply_pruning_transformation -from openvino.runtime import Core -from openvino.runtime import serialize from packaging import version from scipy.special import softmax from transformers.trainer_utils import PREFIX_CHECKPOINT_DIR From 6e02643e31f45e26d798335ecec17055cb37c22d Mon Sep 17 00:00:00 2001 From: Alexander Dokuchaev Date: Sun, 9 Feb 2025 21:24:49 +0200 Subject: [PATCH 4/4] mypy --- nncf/common/utils/backend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nncf/common/utils/backend.py b/nncf/common/utils/backend.py index fd3b8fef93e..211c30a98d1 100644 --- a/nncf/common/utils/backend.py +++ b/nncf/common/utils/backend.py @@ -111,7 +111,7 @@ def is_openvino_model(model: Any) -> bool: :param model: A target model. :return: True if the model is an instance of openvino.Model, otherwise False. """ - import openvino as ov # type: ignore + import openvino as ov return isinstance(model, ov.Model)