Skip to content

Commit af07192

Browse files
committed
Update import message
Signed-off-by: Cheng, Penghui <penghui.cheng@intel.com>
1 parent 94f1ac5 commit af07192

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

examples/neural_compressor/language-modeling/run_clm.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@
5757
from transformers.utils.versions import require_version
5858

5959
from optimum.intel.neural_compressor import INCModelForCausalLM, INCQuantizer, INCTrainer
60-
from optimum.intel.utils.import_utils import is_intel_extension_for_transformers_available
60+
from optimum.intel.utils.import_utils import (
61+
INTEL_EXTENSION_FOR_TRANSFORMERS_IMPORT_ERROR,
62+
is_intel_extension_for_transformers_available,
63+
)
6164

6265

6366
if is_intel_extension_for_transformers_available():
@@ -656,10 +659,7 @@ def compute_metrics(eval_preds):
656659
recipes = {}
657660
if optim_args.quantization_approach == "weight_only":
658661
if not is_intel_extension_for_transformers_available():
659-
raise ImportError(
660-
"Didn't find out intel-etension-for-transformers package. "
661-
"Please install packages: pip install intel-etension-for-transformers and pip install peft."
662-
)
662+
raise ImportError(INTEL_EXTENSION_FOR_TRANSFORMERS_IMPORT_ERROR.format("WeightOnly quantization"))
663663
if optim_args.apply_pruning or optim_args.apply_distillation:
664664
raise ValueError("Weight only quantization and pruning or distillation cannot be combined.")
665665
if optim_args.quantization_methodology == "GPTQ":

optimum/intel/neural_compressor/modeling_base.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@
4343
from optimum.intel.generation import BaseModelForCausalLM
4444

4545
from ...modeling_base import OptimizedModel
46-
from ..utils.import_utils import _torch_version, is_intel_extension_for_transformers_available, is_torch_version
46+
from ..utils.import_utils import (
47+
_torch_version,
48+
is_intel_extension_for_transformers_available,
49+
is_torch_version,
50+
requires_backends,
51+
)
4752
from .configuration import INCConfig
4853
from .utils import WEIGHTS_NAME
4954

@@ -137,15 +142,11 @@ def _from_pretrained(
137142
inc_config = None
138143
msg = None
139144
try:
145+
requires_backends(cls, ["intel_extension_for_transformers"])
140146
quantization_config = WeightOnlyQuantConfig.from_pretrained(model_id)
141147
if getattr(
142148
quantization_config, "algorithm", None
143149
) is not None and quantization_config.algorithm.lower() in ["rtn", "gptq", "awq", "autoaround"]:
144-
if not is_intel_extension_for_transformers_available():
145-
raise ImportError(
146-
"Didn't find out intel-etension-for-transformers package. "
147-
"Please install packages: pip install intel-etension-for-transformers and pip install peft."
148-
)
149150
return ITREX_WOQ_MODEL.from_pretrained(
150151
pretrained_model_name_or_path=model_id,
151152
use_auth_token=use_auth_token,

optimum/intel/utils/import_utils.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
if _intel_extension_for_transformers_available:
6767
try:
6868
_intel_extension_for_transformers_version = importlib_metadata.version("intel_extension_for_transformers")
69+
logging.warn("`transformers` version >= 4.31 is requirements by intel-extension-for-transformers.")
6970
except importlib_metadata.PackageNotFoundError:
7071
_intel_extension_for_transformers_available = False
7172

@@ -350,7 +351,7 @@ def is_timm_version(operation: str, version: str):
350351

351352
INTEL_EXTENSION_FOR_TRANSFORMERS_IMPORT_ERROR = """
352353
{0} requires the intel-extension-for-transformers library but it was not found in your environment. You can install it with pip:
353-
`pip install intel-extension-for-transformers`. Please note that you may need to restart your runtime after installation.
354+
`pip install intel-extension-for-transformers` and `pip install peft`. Please note that you may need to restart your runtime after installation.
354355
"""
355356

356357
DATASETS_IMPORT_ERROR = """

0 commit comments

Comments
 (0)