Fix imports 8

huggingface · Mar 5, 2025 · c060da8 · c060da8
1 parent cfca4ea
commit c060da8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/optimum/intel/openvino/quantization/__init__.py b/optimum/intel/openvino/quantization/__init__.py
@@ -13,6 +13,8 @@
 #  limitations under the License.
 
 
+from optimum.intel.utils.import_utils import is_nncf_available
+
 from .configuration import (
     OVConfig,
     OVDynamicQuantizationConfig,
@@ -22,4 +24,7 @@
     OVQuantizationMethod,
     OVWeightQuantizationConfig,
 )
-from .quantizer import OVQuantizer
+
+
+if is_nncf_available():
+    from .quantizer import OVQuantizer
diff --git a/optimum/intel/openvino/quantization/quantizer.py b/optimum/intel/openvino/quantization/quantizer.py
@@ -19,10 +19,13 @@
 from pathlib import Path
 from typing import Callable, Dict, Iterable, List, Optional, Sized, Union
 
+import nncf
 import openvino
 import torch
 import transformers
 from huggingface_hub.constants import HUGGINGFACE_HUB_CACHE
+from nncf.quantization.advanced_parameters import OverflowFix
+from nncf.torch import register_module
 from openvino._offline_transformations import compress_quantize_weights_transformation
 from openvino.runtime import Core
 from torch.utils._pytree import tree_map
@@ -39,7 +42,6 @@
 from ...utils.import_utils import (
     is_datasets_available,
     is_diffusers_available,
-    is_nncf_available,
 )
 from ...utils.modeling_utils import get_model_device
 from ..utils import (
@@ -48,6 +50,7 @@
     ONNX_WEIGHTS_NAME,
     OV_XML_FILE_NAME,
 )
+from .calibration_dataset_builder import OVCalibrationDatasetBuilder
 from .configuration import (
     OVConfig,
     OVMixedQuantizationConfig,
@@ -60,14 +63,7 @@
 if is_datasets_available():
     from datasets import Dataset
 
-if is_nncf_available():
-    import nncf
-    from nncf.quantization.advanced_parameters import OverflowFix
-    from nncf.torch import register_module
-
-    from .calibration_dataset_builder import OVCalibrationDatasetBuilder
-
-    register_module(ignored_algorithms=[])(Conv1D)
+register_module(ignored_algorithms=[])(Conv1D)
 
 core = Core()
 logger = logging.getLogger(__name__)
@@ -91,11 +87,6 @@ def __init__(self, model: transformers.PreTrainedModel, task: Optional[str] = No
         super().__init__()
         self.model = model
         self.task = task
-
-        if not is_nncf_available():
-            # TODO: add message
-            raise Exception
-
         self.dataset_builder = OVCalibrationDatasetBuilder(model, seed)
 
     @classmethod