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/clip/test_modeling_tf_clip.py

@@ -23,8 +23,8 @@ from importlib import import_module
 
 import requests
 from transformers import CLIPConfig, CLIPTextConfig, CLIPVisionConfig
-from transformers.file_utils import is_tf_available, is_vision_available
 from transformers.testing_utils import is_pt_tf_cross_test, require_tf, require_vision, slow
+from transformers.utils import is_tf_available, is_vision_available
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_tf_common import TFModelTesterMixin, floats_tensor, ids_tensor, random_attention_mask

tests/clip/test_processor_clip.py

@@ -22,9 +22,9 @@ import numpy as np
 import pytest
 
 from transformers import CLIPTokenizer, CLIPTokenizerFast
-from transformers.file_utils import FEATURE_EXTRACTOR_NAME, is_vision_available
 from transformers.models.clip.tokenization_clip import VOCAB_FILES_NAMES
 from transformers.testing_utils import require_vision
+from transformers.utils import FEATURE_EXTRACTOR_NAME, is_vision_available
 
 
 if is_vision_available():

tests/convnext/test_feature_extraction_convnext.py

@@ -18,8 +18,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/convnext/test_modeling_convnext.py

@@ -19,8 +19,8 @@ import inspect
 import unittest
 
 from transformers import ConvNextConfig
-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/convnext/test_modeling_tf_convnext.py

@@ -19,8 +19,8 @@ import unittest
 from typing import List, Tuple
 
 from transformers import ConvNextConfig
-from transformers.file_utils import cached_property, is_tf_available, is_vision_available
 from transformers.testing_utils import require_tf, require_vision, slow
+from transformers.utils import cached_property, is_tf_available, is_vision_available
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_tf_common import TFModelTesterMixin, floats_tensor, ids_tensor

tests/deepspeed/test_deepspeed.py

@@ -24,7 +24,6 @@ from parameterized import parameterized
 from tests.trainer.test_trainer import TrainerIntegrationCommon  # noqa
 from transformers import AutoModel, TrainingArguments, is_torch_available, logging
 from transformers.deepspeed import HfDeepSpeedConfig, is_deepspeed_available
-from transformers.file_utils import WEIGHTS_NAME, is_torch_bf16_available
 from transformers.testing_utils import (
     CaptureLogger,
     CaptureStd,
@@ -40,6 +39,7 @@ from transformers.testing_utils import (
     slow,
 )
 from transformers.trainer_utils import get_last_checkpoint, set_seed
+from transformers.utils import WEIGHTS_NAME, is_torch_bf16_available
 
 
 if is_torch_available():

tests/deit/test_feature_extraction_deit.py

@@ -18,8 +18,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/deit/test_modeling_deit.py

@@ -20,9 +20,9 @@ import unittest
 import warnings
 
 from transformers import DeiTConfig
-from transformers.file_utils import cached_property, is_torch_available, is_vision_available
 from transformers.models.auto import get_values
 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/detr/test_feature_extraction_detr.py

@@ -20,8 +20,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, slow
+from transformers.utils import is_torch_available, is_vision_available
 
 from ..test_feature_extraction_common import FeatureExtractionSavingTestMixin, prepare_image_inputs
 

tests/detr/test_modeling_detr.py

@@ -20,8 +20,8 @@ import math
 import unittest
 
 from transformers import DetrConfig, is_timm_available, is_vision_available
-from transformers.file_utils import cached_property
 from transformers.testing_utils import require_timm, require_vision, slow, torch_device
+from transformers.utils import cached_property
 
 from ..generation.test_generation_utils import GenerationTesterMixin
 from ..test_configuration_common import ConfigTester

tests/extended/test_trainer_ext.py

@@ -20,7 +20,6 @@ import unittest
 from unittest.mock import patch
 
 from parameterized import parameterized
-from transformers.file_utils import is_apex_available
 from transformers.integrations import is_fairscale_available
 from transformers.testing_utils import (
     CaptureStderr,
@@ -37,6 +36,7 @@ from transformers.testing_utils import (
 )
 from transformers.trainer_callback import TrainerState
 from transformers.trainer_utils import set_seed
+from transformers.utils import is_apex_available
 
 
 bindir = os.path.abspath(os.path.dirname(__file__))

tests/fsmt/test_modeling_fsmt.py

@@ -20,8 +20,8 @@ import timeout_decorator  # noqa
 
 from parameterized import parameterized
 from transformers import FSMTConfig, 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/fsmt/test_tokenization_fsmt.py

@@ -18,9 +18,9 @@ import json
 import os
 import unittest
 
-from transformers.file_utils import cached_property
 from transformers.models.fsmt.tokenization_fsmt import VOCAB_FILES_NAMES, FSMTTokenizer
 from transformers.testing_utils import slow
+from transformers.utils import cached_property
 
 from ..test_tokenization_common import TokenizerTesterMixin
 

tests/glpn/test_feature_extraction_glpn.py

@@ -18,8 +18,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/gpt_neo/test_modeling_gpt_neo.py

@@ -18,8 +18,8 @@
 import unittest
 
 from transformers import GPTNeoConfig, is_torch_available
-from transformers.file_utils import cached_property
 from transformers.testing_utils import 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/imagegpt/test_feature_extraction_imagegpt.py

@@ -22,8 +22,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, slow
+from transformers.utils import is_torch_available, is_vision_available
 
 from ..test_feature_extraction_common import FeatureExtractionSavingTestMixin
 

tests/imagegpt/test_modeling_imagegpt.py

@@ -21,8 +21,8 @@ import tempfile
 import unittest
 
 from transformers import ImageGPTConfig
-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 ..generation.test_generation_utils import GenerationTesterMixin
 from ..test_configuration_common import ConfigTester

tests/layoutlmv2/test_feature_extraction_layoutlmv2.py

@@ -18,8 +18,8 @@ import unittest
 
 import numpy as np
 
-from transformers.file_utils import is_pytesseract_available, is_torch_available
 from transformers.testing_utils import require_pytesseract, require_torch
+from transformers.utils import is_pytesseract_available, is_torch_available
 
 from ..test_feature_extraction_common import FeatureExtractionSavingTestMixin, prepare_image_inputs
 

tests/layoutlmv2/test_modeling_layoutlmv2.py

@@ -20,8 +20,8 @@ import random
 import tempfile
 import unittest
 
-from transformers.file_utils import is_detectron2_available, is_torch_available
 from transformers.testing_utils import require_detectron2, require_torch, slow, torch_device
+from transformers.utils import is_detectron2_available, is_torch_available
 
 from ..test_configuration_common import ConfigTester
 from ..test_modeling_common import ModelTesterMixin, _config_zero_init, ids_tensor, random_attention_mask

tests/layoutlmv2/test_processor_layoutlmv2.py

@@ -20,10 +20,10 @@ import unittest
 from typing import List
 
 from transformers import PreTrainedTokenizer, PreTrainedTokenizerBase, PreTrainedTokenizerFast
-from transformers.file_utils import FEATURE_EXTRACTOR_NAME, cached_property, is_pytesseract_available
 from transformers.models.layoutlmv2 import LayoutLMv2Tokenizer, LayoutLMv2TokenizerFast
 from transformers.models.layoutlmv2.tokenization_layoutlmv2 import VOCAB_FILES_NAMES
 from transformers.testing_utils import require_pytesseract, require_tokenizers, require_torch, slow
+from transformers.utils import FEATURE_EXTRACTOR_NAME, cached_property, is_pytesseract_available
 
 
 if is_pytesseract_available():