Merge branch 'main' into bump-transformers-version

Author: echarlaix

optimum/intel/neural_compressor/modeling_base.py

@@ -35,7 +35,6 @@
     GenerationConfig,
     GenerationMixin,
     PretrainedConfig,
-    XLNetLMHeadModel,
 )
 from transformers.modeling_utils import no_init_weights
 from transformers.models.auto.auto_factory import _get_model_class
@@ -249,11 +248,6 @@ class INCModelForVision2Seq(INCModel):
     export_feature = "image-to-text"
 
 
-class INCModelForXLNetLM(INCModel):
-    auto_model_class = XLNetLMHeadModel
-    export_feature = "fill-mask"
-
-
 class INCModelForCausalLM(INCModel, BaseModelForCausalLM):
     auto_model_class = AutoModelForCausalLM
     export_feature = "text-generation"

optimum/intel/neural_compressor/quantization.py

@@ -15,7 +15,6 @@
 import copy
 import inspect
 import logging
-import warnings
 from enum import Enum
 from itertools import chain
 from pathlib import Path
@@ -31,18 +30,9 @@
 from neural_compressor.quantization import fit
 from torch.utils.data import DataLoader, RandomSampler
 from transformers import (
-    AutoModelForCausalLM,
-    AutoModelForMaskedLM,
-    AutoModelForMultipleChoice,
-    AutoModelForQuestionAnswering,
-    AutoModelForSeq2SeqLM,
-    AutoModelForSequenceClassification,
-    AutoModelForTokenClassification,
-    AutoModelForVision2Seq,
     DataCollator,
     PretrainedConfig,
     PreTrainedModel,
-    XLNetLMHeadModel,
     default_data_collator,
 )
 
@@ -71,7 +61,6 @@
     INCModelForSequenceClassification,
     INCModelForTokenClassification,
     INCModelForVision2Seq,
-    INCModelForXLNetLM,
 )
 from .utils import INCDataLoader, _cfgs_to_fx_cfgs
 
@@ -538,49 +527,3 @@ def _apply_quantization_from_config(q_config: Dict, model: torch.nn.Module) -> t
         q_model = convert(q_model, mapping=q_mapping, inplace=True)
 
     return q_model
-
-
-class IncQuantizedModel(INCModel):
-    @classmethod
-    def from_pretrained(cls, *args, **kwargs):
-        warnings.warn(
-            f"The class `{cls.__name__}` has been depreciated and will be removed in optimum-intel v1.12, please use "
-            f"`{cls.__name__.replace('IncQuantized', 'INC')}` instead."
-        )
-        return super().from_pretrained(*args, **kwargs)
-
-
-class IncQuantizedModelForQuestionAnswering(IncQuantizedModel):
-    auto_model_class = AutoModelForQuestionAnswering
-
-
-class IncQuantizedModelForSequenceClassification(IncQuantizedModel):
-    auto_model_class = AutoModelForSequenceClassification
-
-
-class IncQuantizedModelForTokenClassification(IncQuantizedModel):
-    auto_model_class = AutoModelForTokenClassification
-
-
-class IncQuantizedModelForMultipleChoice(IncQuantizedModel):
-    auto_model_class = AutoModelForMultipleChoice
-
-
-class IncQuantizedModelForSeq2SeqLM(IncQuantizedModel):
-    auto_model_class = AutoModelForSeq2SeqLM
-
-
-class IncQuantizedModelForCausalLM(IncQuantizedModel):
-    auto_model_class = AutoModelForCausalLM
-
-
-class IncQuantizedModelForMaskedLM(IncQuantizedModel):
-    auto_model_class = AutoModelForMaskedLM
-
-
-class IncQuantizedModelForXLNetLM(IncQuantizedModel):
-    auto_model_class = XLNetLMHeadModel
-
-
-class IncQuantizedModelForVision2Seq(IncQuantizedModel):
-    auto_model_class = AutoModelForVision2Seq