Reorganize file utils (#16264)

* Split file_utils in several submodules

* Fixes

* Add back more objects

* More fixes

* Who exactly decided to import that from there?

* Second suggestion to code with code review

* Revert wront move

* Fix imports

* Adapt all imports

* Adapt all imports everywhere

* Revert this import, will fix in a separate commit

tests/poolformer/test_feature_extraction_poolformer.py

@@ -17,8 +17,8 @@ import unittest
 
 import numpy as np
 
-from transformers.file_utils import is_torch_available, is_vision_available
 from transformers.testing_utils import require_torch, require_vision
+from transformers.utils import is_torch_available, is_vision_available
 
 from ..test_feature_extraction_common import FeatureExtractionSavingTestMixin, prepare_image_inputs
 

tests/rag/test_modeling_rag.py

@@ -25,7 +25,6 @@ from unittest.mock import patch
 import numpy as np
 
 from transformers import BartTokenizer, T5Tokenizer
-from transformers.file_utils import cached_property, is_datasets_available, is_faiss_available, is_torch_available
 from transformers.models.bert.tokenization_bert import VOCAB_FILES_NAMES as DPR_VOCAB_FILES_NAMES
 from transformers.models.dpr.tokenization_dpr import DPRContextEncoderTokenizer, DPRQuestionEncoderTokenizer
 from transformers.models.roberta.tokenization_roberta import VOCAB_FILES_NAMES as BART_VOCAB_FILES_NAMES
@@ -37,6 +36,7 @@ from transformers.testing_utils import (
     slow,
     torch_device,
 )
+from transformers.utils import cached_property, is_datasets_available, is_faiss_available, is_torch_available
 
 from ..bart.test_modeling_bart import BartModelTester
 from ..dpr.test_modeling_dpr import DPRModelTester

tests/rag/test_modeling_tf_rag.py

@@ -8,11 +8,11 @@ from unittest.mock import patch
 import numpy as np
 
 from transformers import BartTokenizer
-from transformers.file_utils import cached_property, is_datasets_available, is_faiss_available, is_tf_available
 from transformers.models.bert.tokenization_bert import VOCAB_FILES_NAMES as DPR_VOCAB_FILES_NAMES
 from transformers.models.dpr.tokenization_dpr import DPRQuestionEncoderTokenizer
 from transformers.models.roberta.tokenization_roberta import VOCAB_FILES_NAMES as BART_VOCAB_FILES_NAMES
 from transformers.testing_utils import require_sentencepiece, require_tf, require_tokenizers, slow
+from transformers.utils import cached_property, is_datasets_available, is_faiss_available, is_tf_available
 
 
 if is_tf_available() and is_datasets_available() and is_faiss_available():

tests/rag/test_tokenization_rag.py

@@ -19,12 +19,12 @@ import tempfile
 from unittest import TestCase
 
 from transformers import BartTokenizer, BartTokenizerFast, DPRQuestionEncoderTokenizer, DPRQuestionEncoderTokenizerFast
-from transformers.file_utils import is_datasets_available, is_faiss_available, is_torch_available
 from transformers.models.bart.configuration_bart import BartConfig
 from transformers.models.bert.tokenization_bert import VOCAB_FILES_NAMES as DPR_VOCAB_FILES_NAMES
 from transformers.models.dpr.configuration_dpr import DPRConfig
 from transformers.models.roberta.tokenization_roberta import VOCAB_FILES_NAMES as BART_VOCAB_FILES_NAMES
 from transformers.testing_utils import require_faiss, require_tokenizers, require_torch, slow
+from transformers.utils import is_datasets_available, is_faiss_available, is_torch_available
 
 
 if is_torch_available() and is_datasets_available() and is_faiss_available():

tests/reformer/test_tokenization_reformer.py

@@ -17,8 +17,8 @@ import unittest
 from os.path import dirname
 
 from transformers import SPIECE_UNDERLINE, ReformerTokenizer, ReformerTokenizerFast
-from transformers.file_utils import cached_property
 from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow
+from transformers.utils import cached_property
 
 from ..test_tokenization_common import TokenizerTesterMixin
 

tests/resnet/test_modeling_resnet.py

@@ -19,8 +19,8 @@ import inspect
 import unittest
 
 from transformers import ResNetConfig
-from transformers.file_utils import cached_property, is_torch_available, is_vision_available
 from transformers.testing_utils import require_torch, require_vision, slow, torch_device
+from transformers.utils import cached_property, is_torch_available, is_vision_available
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor

tests/segformer/test_feature_extraction_segformer.py

@@ -19,8 +19,8 @@ import unittest
 import numpy as np
 from datasets import load_dataset
 
-from transformers.file_utils import is_torch_available, is_vision_available
 from transformers.testing_utils import require_torch, require_vision
+from transformers.utils import is_torch_available, is_vision_available
 
 from ..test_feature_extraction_common import FeatureExtractionSavingTestMixin, prepare_image_inputs
 

tests/speech_to_text/test_modeling_speech_to_text.py

@@ -21,7 +21,6 @@ import tempfile
 import unittest
 
 from transformers import Speech2TextConfig
-from transformers.file_utils import cached_property
 from transformers.testing_utils import (
     is_torch_available,
     require_sentencepiece,
@@ -31,6 +30,7 @@ from transformers.testing_utils import (
     slow,
     torch_device,
 )
+from transformers.utils import cached_property
 
 from ..generation.test_generation_utils import GenerationTesterMixin
 from ..test_configuration_common import ConfigTester

tests/speech_to_text/test_modeling_tf_speech_to_text.py

@@ -18,8 +18,8 @@ import inspect
 import unittest
 
 from transformers import Speech2TextConfig
-from transformers.file_utils import cached_property, is_tf_available
 from transformers.testing_utils import require_sentencepiece, require_tf, require_tokenizers, slow
+from transformers.utils import cached_property, is_tf_available
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_tf_common import TFModelTesterMixin, floats_tensor, ids_tensor

tests/speech_to_text/test_processor_speech_to_text.py

@@ -21,9 +21,9 @@ from pathlib import Path
 from shutil import copyfile
 
 from transformers import Speech2TextTokenizer, is_speech_available
-from transformers.file_utils import FEATURE_EXTRACTOR_NAME
 from transformers.models.speech_to_text.tokenization_speech_to_text import VOCAB_FILES_NAMES, save_json
 from transformers.testing_utils import require_sentencepiece, require_torch, require_torchaudio
+from transformers.utils import FEATURE_EXTRACTOR_NAME
 
 from .test_feature_extraction_speech_to_text import floats_list
 

tests/swin/test_modeling_swin.py

@@ -19,8 +19,8 @@ import inspect
 import unittest
 
 from transformers import SwinConfig
-from transformers.file_utils import cached_property, is_torch_available, is_vision_available
 from transformers.testing_utils import require_torch, require_vision, slow, torch_device
+from transformers.utils import cached_property, is_torch_available, is_vision_available
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor

tests/t5/test_modeling_t5.py

@@ -19,8 +19,8 @@ import tempfile
 import unittest
 
 from transformers import T5Config, is_torch_available
-from transformers.file_utils import cached_property
 from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow, torch_device
+from transformers.utils import cached_property
 
 from ..generation.test_generation_utils import GenerationTesterMixin
 from ..test_configuration_common import ConfigTester

tests/t5/test_modeling_tf_t5.py

@@ -16,8 +16,8 @@
 import unittest
 
 from transformers import T5Config, is_tf_available
-from transformers.file_utils import cached_property
 from transformers.testing_utils import require_sentencepiece, require_tf, require_tokenizers, slow
+from transformers.utils import cached_property
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_tf_common import TFModelTesterMixin, ids_tensor

tests/t5/test_tokenization_t5.py

@@ -18,8 +18,8 @@ import tempfile
 import unittest
 
 from transformers import SPIECE_UNDERLINE, AddedToken, BatchEncoding, T5Tokenizer, T5TokenizerFast
-from transformers.file_utils import cached_property, is_tf_available, is_torch_available
 from transformers.testing_utils import get_tests_dir, require_sentencepiece, require_tokenizers, slow
+from transformers.utils import cached_property, is_tf_available, is_torch_available
 
 from ..test_tokenization_common import TokenizerTesterMixin
 

tests/tapas/test_modeling_tapas.py

@@ -31,9 +31,9 @@ from transformers import (
     TapasConfig,
     is_torch_available,
 )
-from transformers.file_utils import cached_property
 from transformers.models.auto import get_values
 from transformers.testing_utils import require_scatter, require_torch, slow, torch_device
+from transformers.utils import cached_property
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor, random_attention_mask

tests/tapas/test_modeling_tf_tapas.py

@@ -33,9 +33,9 @@ from transformers import (
     TapasTokenizer,
     is_tf_available,
 )
-from transformers.file_utils import cached_property
 from transformers.models.auto import get_values
 from transformers.testing_utils import require_tensorflow_probability, require_tf, slow
+from transformers.utils import cached_property
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_tf_common import TFModelTesterMixin, ids_tensor

tests/test_feature_extraction_common.py

@@ -24,8 +24,8 @@ from pathlib import Path
 from huggingface_hub import Repository, delete_repo, login
 from requests.exceptions import HTTPError
 from transformers import AutoFeatureExtractor, Wav2Vec2FeatureExtractor
-from transformers.file_utils import is_torch_available, is_vision_available
 from transformers.testing_utils import PASS, USER, is_staging_test
+from transformers.utils import is_torch_available, is_vision_available
 
 
 sys.path.append(str(Path(__file__).parent.parent / "utils"))

tests/test_modeling_common.py

@@ -40,7 +40,6 @@ from transformers import (
     is_torch_available,
     logging,
 )
-from transformers.file_utils import WEIGHTS_NAME, is_flax_available, is_torch_fx_available
 from transformers.models.auto import get_values
 from transformers.testing_utils import (
     PASS,
@@ -55,6 +54,7 @@ from transformers.testing_utils import (
     slow,
     torch_device,
 )
+from transformers.utils import WEIGHTS_NAME, is_flax_available, is_torch_fx_available
 
 
 sys.path.append(str(Path(__file__).parent.parent / "utils"))

tests/trainer/test_trainer.py

@@ -39,7 +39,6 @@ from transformers import (
     is_torch_available,
     logging,
 )
-from transformers.file_utils import WEIGHTS_NAME, is_apex_available
 from transformers.testing_utils import (
     ENDPOINT_STAGING,
     PASS,
@@ -66,6 +65,7 @@ from transformers.testing_utils import (
 )
 from transformers.trainer_utils import PREFIX_CHECKPOINT_DIR
 from transformers.training_args import OptimizerNames
+from transformers.utils import WEIGHTS_NAME, is_apex_available
 from transformers.utils.hp_naming import TrialShortNamer
 
 

tests/trainer/test_trainer_seq2seq.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 from transformers import BertTokenizer, EncoderDecoderModel, Seq2SeqTrainer, Seq2SeqTrainingArguments
-from transformers.file_utils import is_datasets_available
 from transformers.testing_utils import TestCasePlus, require_torch, slow
+from transformers.utils import is_datasets_available
 
 
 if is_datasets_available():