Skip to content

Commit c060da8

Browse files
Fix imports 8
1 parent cfca4ea commit c060da8

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

optimum/intel/openvino/quantization/__init__.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# limitations under the License.
1414

1515

16+
from optimum.intel.utils.import_utils import is_nncf_available
17+
1618
from .configuration import (
1719
OVConfig,
1820
OVDynamicQuantizationConfig,
@@ -22,4 +24,7 @@
2224
OVQuantizationMethod,
2325
OVWeightQuantizationConfig,
2426
)
25-
from .quantizer import OVQuantizer
27+
28+
29+
if is_nncf_available():
30+
from .quantizer import OVQuantizer

optimum/intel/openvino/quantization/quantizer.py

+5-14
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919
from pathlib import Path
2020
from typing import Callable, Dict, Iterable, List, Optional, Sized, Union
2121

22+
import nncf
2223
import openvino
2324
import torch
2425
import transformers
2526
from huggingface_hub.constants import HUGGINGFACE_HUB_CACHE
27+
from nncf.quantization.advanced_parameters import OverflowFix
28+
from nncf.torch import register_module
2629
from openvino._offline_transformations import compress_quantize_weights_transformation
2730
from openvino.runtime import Core
2831
from torch.utils._pytree import tree_map
@@ -39,7 +42,6 @@
3942
from ...utils.import_utils import (
4043
is_datasets_available,
4144
is_diffusers_available,
42-
is_nncf_available,
4345
)
4446
from ...utils.modeling_utils import get_model_device
4547
from ..utils import (
@@ -48,6 +50,7 @@
4850
ONNX_WEIGHTS_NAME,
4951
OV_XML_FILE_NAME,
5052
)
53+
from .calibration_dataset_builder import OVCalibrationDatasetBuilder
5154
from .configuration import (
5255
OVConfig,
5356
OVMixedQuantizationConfig,
@@ -60,14 +63,7 @@
6063
if is_datasets_available():
6164
from datasets import Dataset
6265

63-
if is_nncf_available():
64-
import nncf
65-
from nncf.quantization.advanced_parameters import OverflowFix
66-
from nncf.torch import register_module
67-
68-
from .calibration_dataset_builder import OVCalibrationDatasetBuilder
69-
70-
register_module(ignored_algorithms=[])(Conv1D)
66+
register_module(ignored_algorithms=[])(Conv1D)
7167

7268
core = Core()
7369
logger = logging.getLogger(__name__)
@@ -91,11 +87,6 @@ def __init__(self, model: transformers.PreTrainedModel, task: Optional[str] = No
9187
super().__init__()
9288
self.model = model
9389
self.task = task
94-
95-
if not is_nncf_available():
96-
# TODO: add message
97-
raise Exception
98-
9990
self.dataset_builder = OVCalibrationDatasetBuilder(model, seed)
10091

10192
@classmethod

0 commit comments

Comments
 (0)