Removal of deprecated maps (huggingface#30576)

* [test_all] Remove all imports Remove remaining ARCHIVE MAPS Remove remaining PRETRAINED maps * review comments * [test_all] empty commit to trigger tests
sbucaille · May 9, 2024 · 297b732 · 297b732
1 parent 8c5b3c1
commit 297b732
Show file tree

Hide file tree

Showing 723 changed files with 584 additions and 7,268 deletions.
diff --git a/src/transformers/__init__.py b/src/transformers/__init__.py
diff --git a/src/transformers/models/albert/__init__.py b/src/transformers/models/albert/__init__.py
@@ -26,7 +26,7 @@
 
 
 _import_structure = {
-    "configuration_albert": ["ALBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "AlbertConfig", "AlbertOnnxConfig"],
+    "configuration_albert": ["AlbertConfig", "AlbertOnnxConfig"],
 }
 
 try:
@@ -52,7 +52,6 @@
     pass
 else:
     _import_structure["modeling_albert"] = [
-        "ALBERT_PRETRAINED_MODEL_ARCHIVE_LIST",
         "AlbertForMaskedLM",
         "AlbertForMultipleChoice",
         "AlbertForPreTraining",
@@ -71,7 +70,6 @@
     pass
 else:
     _import_structure["modeling_tf_albert"] = [
-        "TF_ALBERT_PRETRAINED_MODEL_ARCHIVE_LIST",
         "TFAlbertForMaskedLM",
         "TFAlbertForMultipleChoice",
         "TFAlbertForPreTraining",
@@ -101,7 +99,7 @@
     ]
 
 if TYPE_CHECKING:
-    from .configuration_albert import ALBERT_PRETRAINED_CONFIG_ARCHIVE_MAP, AlbertConfig, AlbertOnnxConfig
+    from .configuration_albert import AlbertConfig, AlbertOnnxConfig
 
     try:
         if not is_sentencepiece_available():
@@ -126,7 +124,6 @@
         pass
     else:
         from .modeling_albert import (
-            ALBERT_PRETRAINED_MODEL_ARCHIVE_LIST,
             AlbertForMaskedLM,
             AlbertForMultipleChoice,
             AlbertForPreTraining,
@@ -145,7 +142,6 @@
         pass
     else:
         from .modeling_tf_albert import (
-            TF_ALBERT_PRETRAINED_MODEL_ARCHIVE_LIST,
             TFAlbertForMaskedLM,
             TFAlbertForMultipleChoice,
             TFAlbertForPreTraining,

diff --git a/src/transformers/models/albert/configuration_albert.py b/src/transformers/models/albert/configuration_albert.py
@@ -19,7 +19,6 @@
 
 from ...configuration_utils import PretrainedConfig
 from ...onnx import OnnxConfig
-from ..deprecated._archive_maps import ALBERT_PRETRAINED_CONFIG_ARCHIVE_MAP  # noqa: F401, E402
 
 
 class AlbertConfig(PretrainedConfig):

diff --git a/src/transformers/models/albert/modeling_albert.py b/src/transformers/models/albert/modeling_albert.py
@@ -52,9 +52,6 @@
 _CONFIG_FOR_DOC = "AlbertConfig"
 
 
-from ..deprecated._archive_maps import ALBERT_PRETRAINED_MODEL_ARCHIVE_LIST  # noqa: F401, E402
-
-
 def load_tf_weights_in_albert(model, config, tf_checkpoint_path):
     """Load tf checkpoints in a pytorch model."""
     try:

diff --git a/src/transformers/models/albert/modeling_tf_albert.py b/src/transformers/models/albert/modeling_tf_albert.py
@@ -66,9 +66,6 @@
 _CONFIG_FOR_DOC = "AlbertConfig"
 
 
-from ..deprecated._archive_maps import TF_ALBERT_PRETRAINED_MODEL_ARCHIVE_LIST  # noqa: F401, E402
-
-
 class TFAlbertPreTrainingLoss:
     """
     Loss function suitable for ALBERT pretraining, that is, the task of pretraining a language model by combining SOP +

diff --git a/src/transformers/models/align/__init__.py b/src/transformers/models/align/__init__.py
@@ -22,7 +22,6 @@
 
 _import_structure = {
     "configuration_align": [
-        "ALIGN_PRETRAINED_CONFIG_ARCHIVE_MAP",
         "AlignConfig",
         "AlignTextConfig",
         "AlignVisionConfig",
@@ -37,7 +36,6 @@
     pass
 else:
     _import_structure["modeling_align"] = [
-        "ALIGN_PRETRAINED_MODEL_ARCHIVE_LIST",
         "AlignModel",
         "AlignPreTrainedModel",
         "AlignTextModel",
@@ -46,7 +44,6 @@
 
 if TYPE_CHECKING:
     from .configuration_align import (
-        ALIGN_PRETRAINED_CONFIG_ARCHIVE_MAP,
         AlignConfig,
         AlignTextConfig,
         AlignVisionConfig,
@@ -60,7 +57,6 @@
         pass
     else:
         from .modeling_align import (
-            ALIGN_PRETRAINED_MODEL_ARCHIVE_LIST,
             AlignModel,
             AlignPreTrainedModel,
             AlignTextModel,

diff --git a/src/transformers/models/align/configuration_align.py b/src/transformers/models/align/configuration_align.py
@@ -28,9 +28,6 @@
 logger = logging.get_logger(__name__)
 
 
-from ..deprecated._archive_maps import ALIGN_PRETRAINED_CONFIG_ARCHIVE_MAP  # noqa: F401, E402
-
-
 class AlignTextConfig(PretrainedConfig):
     r"""
     This is the configuration class to store the configuration of a [`AlignTextModel`]. It is used to instantiate a

diff --git a/src/transformers/models/align/modeling_align.py b/src/transformers/models/align/modeling_align.py
@@ -47,9 +47,6 @@
 _CONFIG_FOR_DOC = "AlignConfig"
 
 
-from ..deprecated._archive_maps import ALIGN_PRETRAINED_MODEL_ARCHIVE_LIST  # noqa: F401, E402
-
-
 ALIGN_START_DOCSTRING = r"""
     This model inherits from [`PreTrainedModel`]. Check the superclass documentation for the generic methods the
     library implements for all its model (such as downloading or saving, resizing the input embeddings, pruning heads

diff --git a/src/transformers/models/altclip/__init__.py b/src/transformers/models/altclip/__init__.py
@@ -18,7 +18,6 @@
 
 _import_structure = {
     "configuration_altclip": [
-        "ALTCLIP_PRETRAINED_CONFIG_ARCHIVE_MAP",
         "AltCLIPConfig",
         "AltCLIPTextConfig",
         "AltCLIPVisionConfig",
@@ -33,7 +32,6 @@
     pass
 else:
     _import_structure["modeling_altclip"] = [
-        "ALTCLIP_PRETRAINED_MODEL_ARCHIVE_LIST",
         "AltCLIPPreTrainedModel",
         "AltCLIPModel",
         "AltCLIPTextModel",
@@ -43,7 +41,6 @@
 
 if TYPE_CHECKING:
     from .configuration_altclip import (
-        ALTCLIP_PRETRAINED_CONFIG_ARCHIVE_MAP,
         AltCLIPConfig,
         AltCLIPTextConfig,
         AltCLIPVisionConfig,
@@ -57,7 +54,6 @@
         pass
     else:
         from .modeling_altclip import (
-            ALTCLIP_PRETRAINED_MODEL_ARCHIVE_LIST,
             AltCLIPModel,
             AltCLIPPreTrainedModel,
             AltCLIPTextModel,

diff --git a/src/transformers/models/altclip/configuration_altclip.py b/src/transformers/models/altclip/configuration_altclip.py
@@ -23,9 +23,6 @@
 logger = logging.get_logger(__name__)
 
 
-from ..deprecated._archive_maps import ALTCLIP_PRETRAINED_CONFIG_ARCHIVE_MAP  # noqa: F401, E402
-
-
 class AltCLIPTextConfig(PretrainedConfig):
     r"""
     This is the configuration class to store the configuration of a [`AltCLIPTextModel`]. It is used to instantiate a

diff --git a/src/transformers/models/altclip/modeling_altclip.py b/src/transformers/models/altclip/modeling_altclip.py
@@ -41,9 +41,6 @@
 _CONFIG_FOR_DOC = "AltCLIPConfig"
 
 
-from ..deprecated._archive_maps import ALTCLIP_PRETRAINED_MODEL_ARCHIVE_LIST  # noqa: F401, E402
-
-
 ALTCLIP_START_DOCSTRING = r"""
     This model inherits from [`PreTrainedModel`]. Check the superclass documentation for the generic methods the
     library implements for all its model (such as downloading or saving, resizing the input embeddings, pruning heads

diff --git a/src/transformers/models/audio_spectrogram_transformer/__init__.py b/src/transformers/models/audio_spectrogram_transformer/__init__.py
@@ -17,10 +17,7 @@
 
 
 _import_structure = {
-    "configuration_audio_spectrogram_transformer": [
-        "AUDIO_SPECTROGRAM_TRANSFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP",
-        "ASTConfig",
-    ],
+    "configuration_audio_spectrogram_transformer": ["ASTConfig"],
     "feature_extraction_audio_spectrogram_transformer": ["ASTFeatureExtractor"],
 }
 
@@ -31,7 +28,6 @@
     pass
 else:
     _import_structure["modeling_audio_spectrogram_transformer"] = [
-        "AUDIO_SPECTROGRAM_TRANSFORMER_PRETRAINED_MODEL_ARCHIVE_LIST",
         "ASTForAudioClassification",
         "ASTModel",
         "ASTPreTrainedModel",
@@ -40,7 +36,6 @@
 
 if TYPE_CHECKING:
     from .configuration_audio_spectrogram_transformer import (
-        AUDIO_SPECTROGRAM_TRANSFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP,
         ASTConfig,
     )
     from .feature_extraction_audio_spectrogram_transformer import ASTFeatureExtractor
@@ -52,7 +47,6 @@
         pass
     else:
         from .modeling_audio_spectrogram_transformer import (
-            AUDIO_SPECTROGRAM_TRANSFORMER_PRETRAINED_MODEL_ARCHIVE_LIST,
             ASTForAudioClassification,
             ASTModel,
             ASTPreTrainedModel,

diff --git a/...rmers/models/audio_spectrogram_transformer/configuration_audio_spectrogram_transformer.py b/...rmers/models/audio_spectrogram_transformer/configuration_audio_spectrogram_transformer.py
@@ -22,9 +22,6 @@
 logger = logging.get_logger(__name__)
 
 
-from ..deprecated._archive_maps import AUDIO_SPECTROGRAM_TRANSFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP  # noqa: F401, E402
-
-
 class ASTConfig(PretrainedConfig):
     r"""
     This is the configuration class to store the configuration of a [`ASTModel`]. It is used to instantiate an AST

diff --git a/...ansformers/models/audio_spectrogram_transformer/modeling_audio_spectrogram_transformer.py b/...ansformers/models/audio_spectrogram_transformer/modeling_audio_spectrogram_transformer.py
@@ -45,9 +45,6 @@
 _SEQ_CLASS_EXPECTED_LOSS = 0.17
 
 
-from ..deprecated._archive_maps import AUDIO_SPECTROGRAM_TRANSFORMER_PRETRAINED_MODEL_ARCHIVE_LIST  # noqa: F401, E402
-
-
 class ASTEmbeddings(nn.Module):
     """
     Construct the CLS token, position and patch embeddings.

diff --git a/src/transformers/models/auto/__init__.py b/src/transformers/models/auto/__init__.py
@@ -25,7 +25,7 @@
 
 _import_structure = {
     "auto_factory": ["get_values"],
-    "configuration_auto": ["ALL_PRETRAINED_CONFIG_ARCHIVE_MAP", "CONFIG_MAPPING", "MODEL_NAMES_MAPPING", "AutoConfig"],
+    "configuration_auto": ["CONFIG_MAPPING", "MODEL_NAMES_MAPPING", "AutoConfig"],
     "feature_extraction_auto": ["FEATURE_EXTRACTOR_MAPPING", "AutoFeatureExtractor"],
     "image_processing_auto": ["IMAGE_PROCESSOR_MAPPING", "AutoImageProcessor"],
     "processing_auto": ["PROCESSOR_MAPPING", "AutoProcessor"],
@@ -213,7 +213,7 @@
 
 if TYPE_CHECKING:
     from .auto_factory import get_values
-    from .configuration_auto import ALL_PRETRAINED_CONFIG_ARCHIVE_MAP, CONFIG_MAPPING, MODEL_NAMES_MAPPING, AutoConfig
+    from .configuration_auto import CONFIG_MAPPING, MODEL_NAMES_MAPPING, AutoConfig
     from .feature_extraction_auto import FEATURE_EXTRACTOR_MAPPING, AutoFeatureExtractor
     from .image_processing_auto import IMAGE_PROCESSOR_MAPPING, AutoImageProcessor
     from .processing_auto import PROCESSOR_MAPPING, AutoProcessor

diff --git a/src/transformers/models/auto/configuration_auto.py b/src/transformers/models/auto/configuration_auto.py
@@ -28,9 +28,6 @@
 logger = logging.get_logger(__name__)
 
 
-from ..deprecated._archive_maps import CONFIG_ARCHIVE_MAP_MAPPING_NAMES  # noqa: F401, E402
-
-
 CONFIG_MAPPING_NAMES = OrderedDict(
     [
         # Add configs here
@@ -982,6 +979,3 @@ def register(model_type, config, exist_ok=False):
                 "match!"
             )
         CONFIG_MAPPING.register(model_type, config, exist_ok=exist_ok)
-
-
-ALL_PRETRAINED_CONFIG_ARCHIVE_MAP = _LazyLoadAllMappings(CONFIG_ARCHIVE_MAP_MAPPING_NAMES)
diff --git a/src/transformers/models/autoformer/__init__.py b/src/transformers/models/autoformer/__init__.py
@@ -18,10 +18,7 @@
 
 
 _import_structure = {
-    "configuration_autoformer": [
-        "AUTOFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP",
-        "AutoformerConfig",
-    ],
+    "configuration_autoformer": ["AutoformerConfig"],
 }
 
 try:
@@ -31,7 +28,6 @@
     pass
 else:
     _import_structure["modeling_autoformer"] = [
-        "AUTOFORMER_PRETRAINED_MODEL_ARCHIVE_LIST",
         "AutoformerForPrediction",
         "AutoformerModel",
         "AutoformerPreTrainedModel",
@@ -40,7 +36,6 @@
 
 if TYPE_CHECKING:
     from .configuration_autoformer import (
-        AUTOFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP,
         AutoformerConfig,
     )
 
@@ -51,7 +46,6 @@
         pass
     else:
         from .modeling_autoformer import (
-            AUTOFORMER_PRETRAINED_MODEL_ARCHIVE_LIST,
             AutoformerForPrediction,
             AutoformerModel,
             AutoformerPreTrainedModel,

diff --git a/src/transformers/models/autoformer/configuration_autoformer.py b/src/transformers/models/autoformer/configuration_autoformer.py
@@ -23,9 +23,6 @@
 logger = logging.get_logger(__name__)
 
 
-from ..deprecated._archive_maps import AUTOFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP  # noqa: F401, E402
-
-
 class AutoformerConfig(PretrainedConfig):
     r"""
     This is the configuration class to store the configuration of an [`AutoformerModel`]. It is used to instantiate an

diff --git a/src/transformers/models/autoformer/modeling_autoformer.py b/src/transformers/models/autoformer/modeling_autoformer.py
@@ -167,9 +167,6 @@ class AutoformerModelOutput(ModelOutput):
     static_features: Optional[torch.FloatTensor] = None
 
 
-from ..deprecated._archive_maps import AUTOFORMER_PRETRAINED_MODEL_ARCHIVE_LIST  # noqa: F401, E402
-
-
 # Copied from transformers.models.time_series_transformer.modeling_time_series_transformer.TimeSeriesFeatureEmbedder with TimeSeries->Autoformer
 class AutoformerFeatureEmbedder(nn.Module):
     """

diff --git a/src/transformers/models/bark/__init__.py b/src/transformers/models/bark/__init__.py
@@ -22,7 +22,6 @@
 
 _import_structure = {
     "configuration_bark": [
-        "BARK_PRETRAINED_CONFIG_ARCHIVE_MAP",
         "BarkCoarseConfig",
         "BarkConfig",
         "BarkFineConfig",
@@ -38,7 +37,6 @@
     pass
 else:
     _import_structure["modeling_bark"] = [
-        "BARK_PRETRAINED_MODEL_ARCHIVE_LIST",
         "BarkFineModel",
         "BarkSemanticModel",
         "BarkCoarseModel",
@@ -49,7 +47,6 @@
 
 if TYPE_CHECKING:
     from .configuration_bark import (
-        BARK_PRETRAINED_CONFIG_ARCHIVE_MAP,
         BarkCoarseConfig,
         BarkConfig,
         BarkFineConfig,
@@ -64,7 +61,6 @@
         pass
     else:
         from .modeling_bark import (
-            BARK_PRETRAINED_MODEL_ARCHIVE_LIST,
             BarkCausalModel,
             BarkCoarseModel,
             BarkFineModel,

diff --git a/src/transformers/models/bark/modeling_bark.py b/src/transformers/models/bark/modeling_bark.py
@@ -64,9 +64,6 @@
 _CONFIG_FOR_DOC = "BarkConfig"
 
 
-from ..deprecated._archive_maps import BARK_PRETRAINED_MODEL_ARCHIVE_LIST  # noqa: F401, E402
-
-
 # Copied from transformers.models.llama.modeling_llama._get_unpad_data
 def _get_unpad_data(attention_mask):
     seqlens_in_batch = attention_mask.sum(dim=-1, dtype=torch.int32)