From 56b35ce3ebeb1edb53ef98b3ad3557f79ce788e2 Mon Sep 17 00:00:00 2001 From: Sylvain Gugger <35901082+sgugger@users.noreply.github.com> Date: Wed, 25 May 2022 07:23:56 -0400 Subject: [PATCH] Make check_init script more robust and clean inits (#17408) --- src/transformers/models/beit/__init__.py | 4 +--- src/transformers/models/bert_generation/__init__.py | 4 +--- src/transformers/models/bert_japanese/__init__.py | 4 +--- src/transformers/models/bertweet/__init__.py | 4 +--- src/transformers/models/byt5/__init__.py | 4 +--- src/transformers/models/convnext/__init__.py | 4 +--- src/transformers/models/cvt/__init__.py | 4 +--- src/transformers/models/data2vec/__init__.py | 5 +---- src/transformers/models/deit/__init__.py | 4 +--- src/transformers/models/detr/__init__.py | 4 +--- src/transformers/models/dpt/__init__.py | 4 +--- src/transformers/models/encoder_decoder/__init__.py | 4 +--- src/transformers/models/fnet/__init__.py | 4 +--- src/transformers/models/glpn/__init__.py | 4 +--- src/transformers/models/gpt_neox/__init__.py | 4 +--- src/transformers/models/gptj/__init__.py | 4 +--- src/transformers/models/herbert/__init__.py | 4 +--- src/transformers/models/hubert/__init__.py | 6 +----- src/transformers/models/ibert/__init__.py | 4 +--- src/transformers/models/imagegpt/__init__.py | 4 +--- src/transformers/models/layoutxlm/__init__.py | 4 +--- src/transformers/models/maskformer/__init__.py | 4 +--- src/transformers/models/mbart/__init__.py | 4 +--- src/transformers/models/mmbt/__init__.py | 4 +--- src/transformers/models/mt5/__init__.py | 4 +--- src/transformers/models/opt/__init__.py | 4 +--- src/transformers/models/pegasus/__init__.py | 4 +--- src/transformers/models/phobert/__init__.py | 4 +--- src/transformers/models/plbart/__init__.py | 4 +--- src/transformers/models/poolformer/__init__.py | 4 +--- src/transformers/models/qdqbert/__init__.py | 4 +--- src/transformers/models/reformer/__init__.py | 4 +--- src/transformers/models/regnet/__init__.py | 4 +--- src/transformers/models/rembert/__init__.py | 4 +--- src/transformers/models/resnet/__init__.py | 4 +--- src/transformers/models/segformer/__init__.py | 4 +--- src/transformers/models/sew/__init__.py | 4 +--- src/transformers/models/sew_d/__init__.py | 4 +--- .../models/speech_encoder_decoder/__init__.py | 4 +--- src/transformers/models/speech_to_text/__init__.py | 5 +---- src/transformers/models/speech_to_text_2/__init__.py | 5 +---- src/transformers/models/swin/__init__.py | 4 +--- src/transformers/models/t5/__init__.py | 4 +--- src/transformers/models/tapex/__init__.py | 4 +--- src/transformers/models/trocr/__init__.py | 5 +---- src/transformers/models/unispeech/__init__.py | 4 +--- src/transformers/models/van/__init__.py | 4 +--- src/transformers/models/vilt/__init__.py | 4 +--- .../models/vision_encoder_decoder/__init__.py | 4 +--- src/transformers/models/visual_bert/__init__.py | 4 +--- src/transformers/models/vit/__init__.py | 4 +--- src/transformers/models/vit_mae/__init__.py | 4 +--- src/transformers/models/wav2vec2_phoneme/__init__.py | 6 +----- src/transformers/models/wav2vec2_with_lm/__init__.py | 6 +----- src/transformers/models/wavlm/__init__.py | 4 +--- src/transformers/models/xglm/__init__.py | 4 +--- src/transformers/models/xlm_prophetnet/__init__.py | 5 +---- src/transformers/models/xlnet/__init__.py | 4 +--- src/transformers/models/yolos/__init__.py | 4 +--- src/transformers/models/yoso/__init__.py | 4 +--- utils/check_inits.py | 12 +++++++++++- 61 files changed, 71 insertions(+), 192 deletions(-) diff --git a/src/transformers/models/beit/__init__.py b/src/transformers/models/beit/__init__.py index 1e5be8bca0..40818fff90 100644 --- a/src/transformers/models/beit/__init__.py +++ b/src/transformers/models/beit/__init__.py @@ -27,9 +27,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_beit": ["BEIT_PRETRAINED_CONFIG_ARCHIVE_MAP", "BeitConfig", "BeitOnnxConfig"], -} +_import_structure = {"configuration_beit": ["BEIT_PRETRAINED_CONFIG_ARCHIVE_MAP", "BeitConfig", "BeitOnnxConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/bert_generation/__init__.py b/src/transformers/models/bert_generation/__init__.py index 22aa06d285..14d570bb33 100644 --- a/src/transformers/models/bert_generation/__init__.py +++ b/src/transformers/models/bert_generation/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_sentencepiece_available, is_torch_available -_import_structure = { - "configuration_bert_generation": ["BertGenerationConfig"], -} +_import_structure = {"configuration_bert_generation": ["BertGenerationConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/bert_japanese/__init__.py b/src/transformers/models/bert_japanese/__init__.py index 78d70a7f6e..3331d71c5e 100644 --- a/src/transformers/models/bert_japanese/__init__.py +++ b/src/transformers/models/bert_japanese/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import _LazyModule -_import_structure = { - "tokenization_bert_japanese": ["BertJapaneseTokenizer", "CharacterTokenizer", "MecabTokenizer"], -} +_import_structure = {"tokenization_bert_japanese": ["BertJapaneseTokenizer", "CharacterTokenizer", "MecabTokenizer"]} if TYPE_CHECKING: diff --git a/src/transformers/models/bertweet/__init__.py b/src/transformers/models/bertweet/__init__.py index c9140bd49d..5663d6d673 100644 --- a/src/transformers/models/bertweet/__init__.py +++ b/src/transformers/models/bertweet/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import _LazyModule -_import_structure = { - "tokenization_bertweet": ["BertweetTokenizer"], -} +_import_structure = {"tokenization_bertweet": ["BertweetTokenizer"]} if TYPE_CHECKING: diff --git a/src/transformers/models/byt5/__init__.py b/src/transformers/models/byt5/__init__.py index ec9a03212f..d7cffb390b 100644 --- a/src/transformers/models/byt5/__init__.py +++ b/src/transformers/models/byt5/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import _LazyModule -_import_structure = { - "tokenization_byt5": ["ByT5Tokenizer"], -} +_import_structure = {"tokenization_byt5": ["ByT5Tokenizer"]} if TYPE_CHECKING: diff --git a/src/transformers/models/convnext/__init__.py b/src/transformers/models/convnext/__init__.py index 7ac9f8dbe6..37873982b7 100644 --- a/src/transformers/models/convnext/__init__.py +++ b/src/transformers/models/convnext/__init__.py @@ -27,9 +27,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_convnext": ["CONVNEXT_PRETRAINED_CONFIG_ARCHIVE_MAP", "ConvNextConfig"], -} +_import_structure = {"configuration_convnext": ["CONVNEXT_PRETRAINED_CONFIG_ARCHIVE_MAP", "ConvNextConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/cvt/__init__.py b/src/transformers/models/cvt/__init__.py index 5279f89f21..36a6f69824 100644 --- a/src/transformers/models/cvt/__init__.py +++ b/src/transformers/models/cvt/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_cvt": ["CVT_PRETRAINED_CONFIG_ARCHIVE_MAP", "CvtConfig"], -} +_import_structure = {"configuration_cvt": ["CVT_PRETRAINED_CONFIG_ARCHIVE_MAP", "CvtConfig"]} try: diff --git a/src/transformers/models/data2vec/__init__.py b/src/transformers/models/data2vec/__init__.py index acb348778b..2a92a620d4 100644 --- a/src/transformers/models/data2vec/__init__.py +++ b/src/transformers/models/data2vec/__init__.py @@ -22,10 +22,7 @@ from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_tf_availabl _import_structure = { - "configuration_data2vec_audio": [ - "DATA2VEC_AUDIO_PRETRAINED_CONFIG_ARCHIVE_MAP", - "Data2VecAudioConfig", - ], + "configuration_data2vec_audio": ["DATA2VEC_AUDIO_PRETRAINED_CONFIG_ARCHIVE_MAP", "Data2VecAudioConfig"], "configuration_data2vec_text": [ "DATA2VEC_TEXT_PRETRAINED_CONFIG_ARCHIVE_MAP", "Data2VecTextConfig", diff --git a/src/transformers/models/deit/__init__.py b/src/transformers/models/deit/__init__.py index d05a812b76..6c82e1aaaf 100644 --- a/src/transformers/models/deit/__init__.py +++ b/src/transformers/models/deit/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_deit": ["DEIT_PRETRAINED_CONFIG_ARCHIVE_MAP", "DeiTConfig", "DeiTOnnxConfig"], -} +_import_structure = {"configuration_deit": ["DEIT_PRETRAINED_CONFIG_ARCHIVE_MAP", "DeiTConfig", "DeiTOnnxConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/detr/__init__.py b/src/transformers/models/detr/__init__.py index cc18ac3c8d..5958418807 100644 --- a/src/transformers/models/detr/__init__.py +++ b/src/transformers/models/detr/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_timm_available, is_vision_available -_import_structure = { - "configuration_detr": ["DETR_PRETRAINED_CONFIG_ARCHIVE_MAP", "DetrConfig"], -} +_import_structure = {"configuration_detr": ["DETR_PRETRAINED_CONFIG_ARCHIVE_MAP", "DetrConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/dpt/__init__.py b/src/transformers/models/dpt/__init__.py index 46555ae347..1df82ab628 100644 --- a/src/transformers/models/dpt/__init__.py +++ b/src/transformers/models/dpt/__init__.py @@ -21,9 +21,7 @@ from ...file_utils import _LazyModule, is_tokenizers_available, is_torch_availab from ...utils import OptionalDependencyNotAvailable -_import_structure = { - "configuration_dpt": ["DPT_PRETRAINED_CONFIG_ARCHIVE_MAP", "DPTConfig"], -} +_import_structure = {"configuration_dpt": ["DPT_PRETRAINED_CONFIG_ARCHIVE_MAP", "DPTConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/encoder_decoder/__init__.py b/src/transformers/models/encoder_decoder/__init__.py index 5fdf255c04..759b49f50d 100644 --- a/src/transformers/models/encoder_decoder/__init__.py +++ b/src/transformers/models/encoder_decoder/__init__.py @@ -27,9 +27,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_encoder_decoder": ["EncoderDecoderConfig"], -} +_import_structure = {"configuration_encoder_decoder": ["EncoderDecoderConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/fnet/__init__.py b/src/transformers/models/fnet/__init__.py index 9cf3f49c75..7cece0488f 100644 --- a/src/transformers/models/fnet/__init__.py +++ b/src/transformers/models/fnet/__init__.py @@ -26,9 +26,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_fnet": ["FNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "FNetConfig"], -} +_import_structure = {"configuration_fnet": ["FNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "FNetConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/glpn/__init__.py b/src/transformers/models/glpn/__init__.py index 07f45bdbeb..aa667afff6 100644 --- a/src/transformers/models/glpn/__init__.py +++ b/src/transformers/models/glpn/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_glpn": ["GLPN_PRETRAINED_CONFIG_ARCHIVE_MAP", "GLPNConfig"], -} +_import_structure = {"configuration_glpn": ["GLPN_PRETRAINED_CONFIG_ARCHIVE_MAP", "GLPNConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/gpt_neox/__init__.py b/src/transformers/models/gpt_neox/__init__.py index ca1d2c1f42..814fa9a301 100644 --- a/src/transformers/models/gpt_neox/__init__.py +++ b/src/transformers/models/gpt_neox/__init__.py @@ -21,9 +21,7 @@ from ...file_utils import _LazyModule, is_tokenizers_available, is_torch_availab from ...utils import OptionalDependencyNotAvailable -_import_structure = { - "configuration_gpt_neox": ["GPT_NEOX_PRETRAINED_CONFIG_ARCHIVE_MAP", "GPTNeoXConfig"], -} +_import_structure = {"configuration_gpt_neox": ["GPT_NEOX_PRETRAINED_CONFIG_ARCHIVE_MAP", "GPTNeoXConfig"]} try: if not is_tokenizers_available(): diff --git a/src/transformers/models/gptj/__init__.py b/src/transformers/models/gptj/__init__.py index 9d84816ab1..d4c4e01a6e 100644 --- a/src/transformers/models/gptj/__init__.py +++ b/src/transformers/models/gptj/__init__.py @@ -26,9 +26,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_gptj": ["GPTJ_PRETRAINED_CONFIG_ARCHIVE_MAP", "GPTJConfig", "GPTJOnnxConfig"], -} +_import_structure = {"configuration_gptj": ["GPTJ_PRETRAINED_CONFIG_ARCHIVE_MAP", "GPTJConfig", "GPTJOnnxConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/herbert/__init__.py b/src/transformers/models/herbert/__init__.py index b22255ed3b..ef9d47535e 100644 --- a/src/transformers/models/herbert/__init__.py +++ b/src/transformers/models/herbert/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_tokenizers_available -_import_structure = { - "tokenization_herbert": ["HerbertTokenizer"], -} +_import_structure = {"tokenization_herbert": ["HerbertTokenizer"]} try: if not is_tokenizers_available(): diff --git a/src/transformers/models/hubert/__init__.py b/src/transformers/models/hubert/__init__.py index 67eb27721d..bd415e49a1 100644 --- a/src/transformers/models/hubert/__init__.py +++ b/src/transformers/models/hubert/__init__.py @@ -20,10 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_tf_available, is_torch_available -_import_structure = { - ".wav2vec2.feature_extraction_wav2vec2": ["Wav2Vec2FeatureExtractor"], - "configuration_hubert": ["HUBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "HubertConfig"], -} +_import_structure = {"configuration_hubert": ["HUBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "HubertConfig"]} try: if not is_torch_available(): @@ -54,7 +51,6 @@ else: ] if TYPE_CHECKING: - from ..wav2vec2.feature_extraction_wav2vec2 import Wav2Vec2FeatureExtractor from .configuration_hubert import HUBERT_PRETRAINED_CONFIG_ARCHIVE_MAP, HubertConfig try: diff --git a/src/transformers/models/ibert/__init__.py b/src/transformers/models/ibert/__init__.py index 621972033b..0480da8c47 100644 --- a/src/transformers/models/ibert/__init__.py +++ b/src/transformers/models/ibert/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_ibert": ["IBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "IBertConfig", "IBertOnnxConfig"], -} +_import_structure = {"configuration_ibert": ["IBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "IBertConfig", "IBertOnnxConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/imagegpt/__init__.py b/src/transformers/models/imagegpt/__init__.py index c9b115bac3..ecf7ba9408 100644 --- a/src/transformers/models/imagegpt/__init__.py +++ b/src/transformers/models/imagegpt/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_imagegpt": ["IMAGEGPT_PRETRAINED_CONFIG_ARCHIVE_MAP", "ImageGPTConfig"], -} +_import_structure = {"configuration_imagegpt": ["IMAGEGPT_PRETRAINED_CONFIG_ARCHIVE_MAP", "ImageGPTConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/layoutxlm/__init__.py b/src/transformers/models/layoutxlm/__init__.py index a368067146..9c09d75d68 100644 --- a/src/transformers/models/layoutxlm/__init__.py +++ b/src/transformers/models/layoutxlm/__init__.py @@ -28,9 +28,7 @@ from ...utils import ( ) -_import_structure = { - "processing_layoutxlm": ["LayoutXLMProcessor"], -} +_import_structure = {"processing_layoutxlm": ["LayoutXLMProcessor"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/maskformer/__init__.py b/src/transformers/models/maskformer/__init__.py index 71a7b69d42..4234f76dc5 100644 --- a/src/transformers/models/maskformer/__init__.py +++ b/src/transformers/models/maskformer/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_maskformer": ["MASKFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP", "MaskFormerConfig"], -} +_import_structure = {"configuration_maskformer": ["MASKFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP", "MaskFormerConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/mbart/__init__.py b/src/transformers/models/mbart/__init__.py index 93ea459c50..ef967c2482 100644 --- a/src/transformers/models/mbart/__init__.py +++ b/src/transformers/models/mbart/__init__.py @@ -28,9 +28,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_mbart": ["MBART_PRETRAINED_CONFIG_ARCHIVE_MAP", "MBartConfig", "MBartOnnxConfig"], -} +_import_structure = {"configuration_mbart": ["MBART_PRETRAINED_CONFIG_ARCHIVE_MAP", "MBartConfig", "MBartOnnxConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/mmbt/__init__.py b/src/transformers/models/mmbt/__init__.py index 3659bf36ca..d95a2cc8d8 100644 --- a/src/transformers/models/mmbt/__init__.py +++ b/src/transformers/models/mmbt/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_mmbt": ["MMBTConfig"], -} +_import_structure = {"configuration_mmbt": ["MMBTConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/mt5/__init__.py b/src/transformers/models/mt5/__init__.py index c694a8fb96..66daf82b38 100644 --- a/src/transformers/models/mt5/__init__.py +++ b/src/transformers/models/mt5/__init__.py @@ -43,9 +43,7 @@ else: MT5TokenizerFast = T5TokenizerFast -_import_structure = { - "configuration_mt5": ["MT5Config"], -} +_import_structure = {"configuration_mt5": ["MT5Config"]} try: if not is_torch_available(): diff --git a/src/transformers/models/opt/__init__.py b/src/transformers/models/opt/__init__.py index ad097d5083..303c6fd453 100644 --- a/src/transformers/models/opt/__init__.py +++ b/src/transformers/models/opt/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import _LazyModule, is_tokenizers_available, is_torch_available -_import_structure = { - "configuration_opt": ["OPT_PRETRAINED_CONFIG_ARCHIVE_MAP", "OPTConfig"], -} +_import_structure = {"configuration_opt": ["OPT_PRETRAINED_CONFIG_ARCHIVE_MAP", "OPTConfig"]} if is_torch_available(): diff --git a/src/transformers/models/pegasus/__init__.py b/src/transformers/models/pegasus/__init__.py index a4f90ae10e..ca04afeeb1 100644 --- a/src/transformers/models/pegasus/__init__.py +++ b/src/transformers/models/pegasus/__init__.py @@ -28,9 +28,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_pegasus": ["PEGASUS_PRETRAINED_CONFIG_ARCHIVE_MAP", "PegasusConfig"], -} +_import_structure = {"configuration_pegasus": ["PEGASUS_PRETRAINED_CONFIG_ARCHIVE_MAP", "PegasusConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/phobert/__init__.py b/src/transformers/models/phobert/__init__.py index 0f226f537a..0d9a6f4cea 100644 --- a/src/transformers/models/phobert/__init__.py +++ b/src/transformers/models/phobert/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import _LazyModule -_import_structure = { - "tokenization_phobert": ["PhobertTokenizer"], -} +_import_structure = {"tokenization_phobert": ["PhobertTokenizer"]} if TYPE_CHECKING: diff --git a/src/transformers/models/plbart/__init__.py b/src/transformers/models/plbart/__init__.py index ee3a5a71c6..06204a8901 100644 --- a/src/transformers/models/plbart/__init__.py +++ b/src/transformers/models/plbart/__init__.py @@ -26,9 +26,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_plbart": ["PLBART_PRETRAINED_CONFIG_ARCHIVE_MAP", "PLBartConfig"], -} +_import_structure = {"configuration_plbart": ["PLBART_PRETRAINED_CONFIG_ARCHIVE_MAP", "PLBartConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/poolformer/__init__.py b/src/transformers/models/poolformer/__init__.py index dda6d67950..7cb5e4acac 100644 --- a/src/transformers/models/poolformer/__init__.py +++ b/src/transformers/models/poolformer/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_poolformer": ["POOLFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP", "PoolFormerConfig"], -} +_import_structure = {"configuration_poolformer": ["POOLFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP", "PoolFormerConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/qdqbert/__init__.py b/src/transformers/models/qdqbert/__init__.py index f8807c81cf..60f03338f4 100644 --- a/src/transformers/models/qdqbert/__init__.py +++ b/src/transformers/models/qdqbert/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_qdqbert": ["QDQBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "QDQBertConfig"], -} +_import_structure = {"configuration_qdqbert": ["QDQBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "QDQBertConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/reformer/__init__.py b/src/transformers/models/reformer/__init__.py index ca8a0eea43..979074bcc7 100644 --- a/src/transformers/models/reformer/__init__.py +++ b/src/transformers/models/reformer/__init__.py @@ -27,9 +27,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_reformer": ["REFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP", "ReformerConfig"], -} +_import_structure = {"configuration_reformer": ["REFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP", "ReformerConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/regnet/__init__.py b/src/transformers/models/regnet/__init__.py index c5a4f19ece..2de85e0cc1 100644 --- a/src/transformers/models/regnet/__init__.py +++ b/src/transformers/models/regnet/__init__.py @@ -22,9 +22,7 @@ from ...file_utils import _LazyModule, is_torch_available from ...utils import OptionalDependencyNotAvailable -_import_structure = { - "configuration_regnet": ["REGNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "RegNetConfig"], -} +_import_structure = {"configuration_regnet": ["REGNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "RegNetConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/rembert/__init__.py b/src/transformers/models/rembert/__init__.py index 526fc3c030..10af6c4d27 100644 --- a/src/transformers/models/rembert/__init__.py +++ b/src/transformers/models/rembert/__init__.py @@ -28,9 +28,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_rembert": ["REMBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "RemBertConfig"], -} +_import_structure = {"configuration_rembert": ["REMBERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "RemBertConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/resnet/__init__.py b/src/transformers/models/resnet/__init__.py index bf3a41e043..b5ab2d38fb 100644 --- a/src/transformers/models/resnet/__init__.py +++ b/src/transformers/models/resnet/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_resnet": ["RESNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "ResNetConfig"], -} +_import_structure = {"configuration_resnet": ["RESNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "ResNetConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/segformer/__init__.py b/src/transformers/models/segformer/__init__.py index ce77d52d7e..1ce4ecb07a 100644 --- a/src/transformers/models/segformer/__init__.py +++ b/src/transformers/models/segformer/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_segformer": ["SEGFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP", "SegformerConfig"], -} +_import_structure = {"configuration_segformer": ["SEGFORMER_PRETRAINED_CONFIG_ARCHIVE_MAP", "SegformerConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/sew/__init__.py b/src/transformers/models/sew/__init__.py index f8c7fbe15c..bfe39bea1b 100644 --- a/src/transformers/models/sew/__init__.py +++ b/src/transformers/models/sew/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_sew": ["SEW_PRETRAINED_CONFIG_ARCHIVE_MAP", "SEWConfig"], -} +_import_structure = {"configuration_sew": ["SEW_PRETRAINED_CONFIG_ARCHIVE_MAP", "SEWConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/sew_d/__init__.py b/src/transformers/models/sew_d/__init__.py index 4e44b502c9..905bfb0f5b 100644 --- a/src/transformers/models/sew_d/__init__.py +++ b/src/transformers/models/sew_d/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_sew_d": ["SEW_D_PRETRAINED_CONFIG_ARCHIVE_MAP", "SEWDConfig"], -} +_import_structure = {"configuration_sew_d": ["SEW_D_PRETRAINED_CONFIG_ARCHIVE_MAP", "SEWDConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/speech_encoder_decoder/__init__.py b/src/transformers/models/speech_encoder_decoder/__init__.py index 4cf7097046..4eea93eacd 100644 --- a/src/transformers/models/speech_encoder_decoder/__init__.py +++ b/src/transformers/models/speech_encoder_decoder/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_flax_available, is_torch_available -_import_structure = { - "configuration_speech_encoder_decoder": ["SpeechEncoderDecoderConfig"], -} +_import_structure = {"configuration_speech_encoder_decoder": ["SpeechEncoderDecoderConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/speech_to_text/__init__.py b/src/transformers/models/speech_to_text/__init__.py index 241d397b32..20eba2bf6a 100644 --- a/src/transformers/models/speech_to_text/__init__.py +++ b/src/transformers/models/speech_to_text/__init__.py @@ -28,10 +28,7 @@ from ...utils import ( _import_structure = { - "configuration_speech_to_text": [ - "SPEECH_TO_TEXT_PRETRAINED_CONFIG_ARCHIVE_MAP", - "Speech2TextConfig", - ], + "configuration_speech_to_text": ["SPEECH_TO_TEXT_PRETRAINED_CONFIG_ARCHIVE_MAP", "Speech2TextConfig"], } try: diff --git a/src/transformers/models/speech_to_text_2/__init__.py b/src/transformers/models/speech_to_text_2/__init__.py index bd5b499b27..645a397460 100644 --- a/src/transformers/models/speech_to_text_2/__init__.py +++ b/src/transformers/models/speech_to_text_2/__init__.py @@ -27,10 +27,7 @@ from ...utils import ( _import_structure = { - "configuration_speech_to_text_2": [ - "SPEECH_TO_TEXT_2_PRETRAINED_CONFIG_ARCHIVE_MAP", - "Speech2Text2Config", - ], + "configuration_speech_to_text_2": ["SPEECH_TO_TEXT_2_PRETRAINED_CONFIG_ARCHIVE_MAP", "Speech2Text2Config"], "processing_speech_to_text_2": ["Speech2Text2Processor"], "tokenization_speech_to_text_2": ["Speech2Text2Tokenizer"], } diff --git a/src/transformers/models/swin/__init__.py b/src/transformers/models/swin/__init__.py index 65b19a36ae..33a9bddeea 100644 --- a/src/transformers/models/swin/__init__.py +++ b/src/transformers/models/swin/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_tf_available, is_torch_available -_import_structure = { - "configuration_swin": ["SWIN_PRETRAINED_CONFIG_ARCHIVE_MAP", "SwinConfig"], -} +_import_structure = {"configuration_swin": ["SWIN_PRETRAINED_CONFIG_ARCHIVE_MAP", "SwinConfig"]} try: diff --git a/src/transformers/models/t5/__init__.py b/src/transformers/models/t5/__init__.py index a6c4c8432d..178fb38678 100644 --- a/src/transformers/models/t5/__init__.py +++ b/src/transformers/models/t5/__init__.py @@ -29,9 +29,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_t5": ["T5_PRETRAINED_CONFIG_ARCHIVE_MAP", "T5Config", "T5OnnxConfig"], -} +_import_structure = {"configuration_t5": ["T5_PRETRAINED_CONFIG_ARCHIVE_MAP", "T5Config", "T5OnnxConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/tapex/__init__.py b/src/transformers/models/tapex/__init__.py index 36c5938d23..3b13bed2ca 100644 --- a/src/transformers/models/tapex/__init__.py +++ b/src/transformers/models/tapex/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...file_utils import _LazyModule -_import_structure = { - "tokenization_tapex": ["TapexTokenizer"], -} +_import_structure = {"tokenization_tapex": ["TapexTokenizer"]} if TYPE_CHECKING: diff --git a/src/transformers/models/trocr/__init__.py b/src/transformers/models/trocr/__init__.py index 5c4273abc7..8e18eaeb40 100644 --- a/src/transformers/models/trocr/__init__.py +++ b/src/transformers/models/trocr/__init__.py @@ -27,10 +27,7 @@ from ...utils import ( _import_structure = { - "configuration_trocr": [ - "TROCR_PRETRAINED_CONFIG_ARCHIVE_MAP", - "TrOCRConfig", - ], + "configuration_trocr": ["TROCR_PRETRAINED_CONFIG_ARCHIVE_MAP", "TrOCRConfig"], "processing_trocr": ["TrOCRProcessor"], } diff --git a/src/transformers/models/unispeech/__init__.py b/src/transformers/models/unispeech/__init__.py index b68560e9b0..3713e7d8a1 100644 --- a/src/transformers/models/unispeech/__init__.py +++ b/src/transformers/models/unispeech/__init__.py @@ -26,9 +26,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_unispeech": ["UNISPEECH_PRETRAINED_CONFIG_ARCHIVE_MAP", "UniSpeechConfig"], -} +_import_structure = {"configuration_unispeech": ["UNISPEECH_PRETRAINED_CONFIG_ARCHIVE_MAP", "UniSpeechConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/van/__init__.py b/src/transformers/models/van/__init__.py index 8736a6dffd..44c88f0448 100644 --- a/src/transformers/models/van/__init__.py +++ b/src/transformers/models/van/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_van": ["VAN_PRETRAINED_CONFIG_ARCHIVE_MAP", "VanConfig"], -} +_import_structure = {"configuration_van": ["VAN_PRETRAINED_CONFIG_ARCHIVE_MAP", "VanConfig"]} try: diff --git a/src/transformers/models/vilt/__init__.py b/src/transformers/models/vilt/__init__.py index 8846eb1e0a..3861b081be 100644 --- a/src/transformers/models/vilt/__init__.py +++ b/src/transformers/models/vilt/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_vilt": ["VILT_PRETRAINED_CONFIG_ARCHIVE_MAP", "ViltConfig"], -} +_import_structure = {"configuration_vilt": ["VILT_PRETRAINED_CONFIG_ARCHIVE_MAP", "ViltConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/vision_encoder_decoder/__init__.py b/src/transformers/models/vision_encoder_decoder/__init__.py index 2bc988223c..5d501b8feb 100644 --- a/src/transformers/models/vision_encoder_decoder/__init__.py +++ b/src/transformers/models/vision_encoder_decoder/__init__.py @@ -27,9 +27,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_vision_encoder_decoder": ["VisionEncoderDecoderConfig"], -} +_import_structure = {"configuration_vision_encoder_decoder": ["VisionEncoderDecoderConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/visual_bert/__init__.py b/src/transformers/models/visual_bert/__init__.py index 0aa2029620..f7a5390d13 100644 --- a/src/transformers/models/visual_bert/__init__.py +++ b/src/transformers/models/visual_bert/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_visual_bert": ["VISUAL_BERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "VisualBertConfig"], -} +_import_structure = {"configuration_visual_bert": ["VISUAL_BERT_PRETRAINED_CONFIG_ARCHIVE_MAP", "VisualBertConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/vit/__init__.py b/src/transformers/models/vit/__init__.py index a1952533a3..b30a9ec15d 100644 --- a/src/transformers/models/vit/__init__.py +++ b/src/transformers/models/vit/__init__.py @@ -27,9 +27,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_vit": ["VIT_PRETRAINED_CONFIG_ARCHIVE_MAP", "ViTConfig", "ViTOnnxConfig"], -} +_import_structure = {"configuration_vit": ["VIT_PRETRAINED_CONFIG_ARCHIVE_MAP", "ViTConfig", "ViTOnnxConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/vit_mae/__init__.py b/src/transformers/models/vit_mae/__init__.py index 8cc44d88d8..b785f7f6ee 100644 --- a/src/transformers/models/vit_mae/__init__.py +++ b/src/transformers/models/vit_mae/__init__.py @@ -26,9 +26,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_vit_mae": ["VIT_MAE_PRETRAINED_CONFIG_ARCHIVE_MAP", "ViTMAEConfig"], -} +_import_structure = {"configuration_vit_mae": ["VIT_MAE_PRETRAINED_CONFIG_ARCHIVE_MAP", "ViTMAEConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/wav2vec2_phoneme/__init__.py b/src/transformers/models/wav2vec2_phoneme/__init__.py index 4d6ea18a33..84dc9942d5 100644 --- a/src/transformers/models/wav2vec2_phoneme/__init__.py +++ b/src/transformers/models/wav2vec2_phoneme/__init__.py @@ -20,11 +20,7 @@ from typing import TYPE_CHECKING from ...utils import _LazyModule -# fmt: off -_import_structure = { - "tokenization_wav2vec2_phoneme": ["Wav2Vec2PhonemeCTCTokenizer"] -} -# fmt: on +_import_structure = {"tokenization_wav2vec2_phoneme": ["Wav2Vec2PhonemeCTCTokenizer"]} if TYPE_CHECKING: diff --git a/src/transformers/models/wav2vec2_with_lm/__init__.py b/src/transformers/models/wav2vec2_with_lm/__init__.py index 8730f3508e..174946ae10 100644 --- a/src/transformers/models/wav2vec2_with_lm/__init__.py +++ b/src/transformers/models/wav2vec2_with_lm/__init__.py @@ -20,11 +20,7 @@ from typing import TYPE_CHECKING from ...utils import _LazyModule -# fmt: off -_import_structure = { - "processing_wav2vec2_with_lm": ["Wav2Vec2ProcessorWithLM"] -} -# fmt: on +_import_structure = {"processing_wav2vec2_with_lm": ["Wav2Vec2ProcessorWithLM"]} if TYPE_CHECKING: diff --git a/src/transformers/models/wavlm/__init__.py b/src/transformers/models/wavlm/__init__.py index 151cdb4ee7..9cd64b25da 100644 --- a/src/transformers/models/wavlm/__init__.py +++ b/src/transformers/models/wavlm/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available -_import_structure = { - "configuration_wavlm": ["WAVLM_PRETRAINED_CONFIG_ARCHIVE_MAP", "WavLMConfig"], -} +_import_structure = {"configuration_wavlm": ["WAVLM_PRETRAINED_CONFIG_ARCHIVE_MAP", "WavLMConfig"]} try: if not is_torch_available(): diff --git a/src/transformers/models/xglm/__init__.py b/src/transformers/models/xglm/__init__.py index aca0e3ccf0..2ab60e4cb4 100644 --- a/src/transformers/models/xglm/__init__.py +++ b/src/transformers/models/xglm/__init__.py @@ -28,9 +28,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_xglm": ["XGLM_PRETRAINED_CONFIG_ARCHIVE_MAP", "XGLMConfig"], -} +_import_structure = {"configuration_xglm": ["XGLM_PRETRAINED_CONFIG_ARCHIVE_MAP", "XGLMConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/xlm_prophetnet/__init__.py b/src/transformers/models/xlm_prophetnet/__init__.py index d70fdc9984..8fbec3d400 100644 --- a/src/transformers/models/xlm_prophetnet/__init__.py +++ b/src/transformers/models/xlm_prophetnet/__init__.py @@ -21,10 +21,7 @@ from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_sentencepie _import_structure = { - "configuration_xlm_prophetnet": [ - "XLM_PROPHETNET_PRETRAINED_CONFIG_ARCHIVE_MAP", - "XLMProphetNetConfig", - ], + "configuration_xlm_prophetnet": ["XLM_PROPHETNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "XLMProphetNetConfig"], } try: diff --git a/src/transformers/models/xlnet/__init__.py b/src/transformers/models/xlnet/__init__.py index b520fe641b..d01edf267c 100644 --- a/src/transformers/models/xlnet/__init__.py +++ b/src/transformers/models/xlnet/__init__.py @@ -28,9 +28,7 @@ from ...utils import ( ) -_import_structure = { - "configuration_xlnet": ["XLNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "XLNetConfig"], -} +_import_structure = {"configuration_xlnet": ["XLNET_PRETRAINED_CONFIG_ARCHIVE_MAP", "XLNetConfig"]} try: if not is_sentencepiece_available(): diff --git a/src/transformers/models/yolos/__init__.py b/src/transformers/models/yolos/__init__.py index 441b75e19c..91cc0e7032 100644 --- a/src/transformers/models/yolos/__init__.py +++ b/src/transformers/models/yolos/__init__.py @@ -20,9 +20,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available -_import_structure = { - "configuration_yolos": ["YOLOS_PRETRAINED_CONFIG_ARCHIVE_MAP", "YolosConfig"], -} +_import_structure = {"configuration_yolos": ["YOLOS_PRETRAINED_CONFIG_ARCHIVE_MAP", "YolosConfig"]} try: if not is_vision_available(): diff --git a/src/transformers/models/yoso/__init__.py b/src/transformers/models/yoso/__init__.py index b8c53fe862..400a0303c0 100644 --- a/src/transformers/models/yoso/__init__.py +++ b/src/transformers/models/yoso/__init__.py @@ -21,9 +21,7 @@ from typing import TYPE_CHECKING from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_tokenizers_available, is_torch_available -_import_structure = { - "configuration_yoso": ["YOSO_PRETRAINED_CONFIG_ARCHIVE_MAP", "YosoConfig"], -} +_import_structure = {"configuration_yoso": ["YOSO_PRETRAINED_CONFIG_ARCHIVE_MAP", "YosoConfig"]} try: if not is_torch_available(): diff --git a/utils/check_inits.py b/utils/check_inits.py index 5b95e609e1..98d4caf010 100644 --- a/utils/check_inits.py +++ b/utils/check_inits.py @@ -25,6 +25,8 @@ PATH_TO_TRANSFORMERS = "src/transformers" # Matches is_xxx_available() _re_backend = re.compile(r"is\_([a-z_]*)_available()") +# Catches a one-line _import_struct = {xxx} +_re_one_line_import_struct = re.compile(r"^_import_structure\s+=\s+\{([^\}]+)\}") # Catches a line with a key-values pattern: "bla": ["foo", "bar"] _re_import_struct_key_value = re.compile(r'\s+"\S*":\s+\[([^\]]*)\]') # Catches a line if not is_foo_available @@ -74,6 +76,14 @@ def parse_init(init_file): objects = [] while not lines[line_index].startswith("if TYPE_CHECKING") and find_backend(lines[line_index]) is None: line = lines[line_index] + # If we have everything on a single line, let's deal with it. + if _re_one_line_import_struct.search(line): + content = _re_one_line_import_struct.search(line).groups()[0] + imports = re.findall("\[([^\]]+)\]", content) + for imp in imports: + objects.extend([obj[1:-1] for obj in imp.split(", ")]) + line_index += 1 + continue single_line_import_search = _re_import_struct_key_value.search(line) if single_line_import_search is not None: imports = [obj[1:-1] for obj in single_line_import_search.groups()[0].split(", ") if len(obj) > 0] @@ -144,7 +154,7 @@ def parse_init(init_file): type_hint_objects = {"none": objects} # Let's continue with backend-specific objects while line_index < len(lines): - # If the line is an if is_backemd_available, we grab all objects associated. + # If the line is an if is_backend_available, we grab all objects associated. backend = find_backend(lines[line_index]) # Check if the backend declaration is inside a try block: if _re_try.search(lines[line_index - 1]) is None: