[Test refactor 1/5] Per-folder tests reorganization (#15725)

* Per-folder tests reorganization
Co-authored-by: sgugger <sylvain.gugger@gmail.com>
Co-authored-by: Stas Bekman <stas@stason.org>

tests/test_modeling_deberta.py → tests/deberta/test_modeling_deberta.py

@@ -17,8 +17,8 @@ import unittest
 from transformers import DebertaConfig, is_torch_available
 from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow, torch_device
 
-from .test_configuration_common import ConfigTester
-from .test_modeling_common import ModelTesterMixin, ids_tensor
+from ..test_configuration_common import ConfigTester
+from ..test_modeling_common import ModelTesterMixin, ids_tensor
 
 
 if is_torch_available():

tests/test_modeling_tf_deberta.py → tests/deberta/test_modeling_tf_deberta.py

@@ -19,8 +19,8 @@ import unittest
 from transformers import DebertaConfig, is_tf_available
 from transformers.testing_utils import require_tf, slow
 
-from .test_configuration_common import ConfigTester
-from .test_modeling_tf_common import TFModelTesterMixin, ids_tensor
+from ..test_configuration_common import ConfigTester
+from ..test_modeling_tf_common import TFModelTesterMixin, ids_tensor
 
 
 if is_tf_available():

tests/test_tokenization_deberta.py → tests/deberta/test_tokenization_deberta.py

@@ -22,7 +22,7 @@ from transformers import DebertaTokenizer, DebertaTokenizerFast
 from transformers.models.deberta.tokenization_deberta import VOCAB_FILES_NAMES
 from transformers.testing_utils import slow
 
-from .test_tokenization_common import TokenizerTesterMixin
+from ..test_tokenization_common import TokenizerTesterMixin
 
 
 class DebertaTokenizationTest(TokenizerTesterMixin, unittest.TestCase):

tests/test_modeling_deberta_v2.py → tests/deberta_v2/test_modeling_deberta_v2.py

@@ -17,8 +17,8 @@ import unittest
 from transformers import DebertaV2Config, is_torch_available
 from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow, torch_device
 
-from .test_configuration_common import ConfigTester
-from .test_modeling_common import ModelTesterMixin, ids_tensor
+from ..test_configuration_common import ConfigTester
+from ..test_modeling_common import ModelTesterMixin, ids_tensor
 
 
 if is_torch_available():

tests/test_modeling_tf_deberta_v2.py → tests/deberta_v2/test_modeling_tf_deberta_v2.py

@@ -19,8 +19,8 @@ import unittest
 from transformers import DebertaV2Config, is_tf_available
 from transformers.testing_utils import require_tf, slow
 
-from .test_configuration_common import ConfigTester
-from .test_modeling_tf_common import TFModelTesterMixin, ids_tensor
+from ..test_configuration_common import ConfigTester
+from ..test_modeling_tf_common import TFModelTesterMixin, ids_tensor
 
 
 if is_tf_available():

tests/test_tokenization_deberta_v2.py → tests/deberta_v2/test_tokenization_deberta_v2.py

@@ -15,14 +15,15 @@
 
 import os
 import unittest
+from os.path import dirname
 
 from transformers import DebertaV2Tokenizer
 from transformers.testing_utils import require_sentencepiece, require_tokenizers, slow
 
-from .test_tokenization_common import TokenizerTesterMixin
+from ..test_tokenization_common import TokenizerTesterMixin
 
 
-SAMPLE_VOCAB = os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures/spiece.model")
+SAMPLE_VOCAB = os.path.join(dirname(dirname(os.path.abspath(__file__))), "fixtures/spiece.model")
 
 
 @require_sentencepiece

tests/deepspeed/test_deepspeed.py

@@ -27,7 +27,6 @@ from transformers.testing_utils import (
     CaptureLogger,
     CaptureStd,
     CaptureStderr,
-    ExtendSysPath,
     LoggingLevel,
     TestCasePlus,
     execute_subprocess_async,
@@ -40,14 +39,11 @@ from transformers.testing_utils import (
 )
 from transformers.trainer_utils import get_last_checkpoint, set_seed
 
+from ..trainer.test_trainer import TrainerIntegrationCommon  # noqa
 
-tests_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-root_dir = os.path.dirname(tests_dir)
-with ExtendSysPath(tests_dir):
-    from test_trainer import TrainerIntegrationCommon  # noqa
 
-    if is_torch_available():
-        from test_trainer import RegressionModelConfig, RegressionPreTrainedModel, get_regression_trainer  # noqa
+if is_torch_available():
+    from ..trainer.test_trainer import RegressionModelConfig, RegressionPreTrainedModel, get_regression_trainer  # noqa
 
 
 set_seed(42)

tests/deepspeed/test_model_zoo.py

@@ -15,11 +15,11 @@
 import itertools
 import os
 import subprocess
+from os.path import dirname
 
 from parameterized import parameterized
 from transformers import is_torch_available
 from transformers.testing_utils import (
-    ExtendSysPath,
     TestCasePlus,
     execute_subprocess_async,
     get_gpu_count,
@@ -29,14 +29,11 @@ from transformers.testing_utils import (
 )
 from transformers.trainer_utils import set_seed
 
+from ..trainer.test_trainer import TrainerIntegrationCommon  # noqa
 
-tests_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-root_dir = os.path.dirname(tests_dir)
-with ExtendSysPath(tests_dir):
-    from test_trainer import TrainerIntegrationCommon  # noqa
 
-    if is_torch_available():
-        from test_trainer import RegressionModelConfig, RegressionPreTrainedModel, get_regression_trainer  # noqa
+if is_torch_available():
+    from ..trainer.test_trainer import RegressionModelConfig, RegressionPreTrainedModel, get_regression_trainer  # noqa
 
 
 set_seed(42)
@@ -70,6 +67,8 @@ ELECTRA_TINY = "hf-internal-testing/tiny-electra"
 XLNET_TINY = "sshleifer/tiny-xlnet-base-cased"
 BERT_TINY = "hf-internal-testing/tiny-bert"
 
+FIXTURE_DIRECTORY = os.path.join(dirname(dirname(os.path.abspath(__file__))), "fixtures")
+ROOT_DIRECTORY = os.path.join(dirname(dirname(dirname(os.path.abspath(__file__)))))
 
 # TODO: to add:
 # albert
@@ -97,10 +96,9 @@ def get_launcher(distributed=False):
 
 
 def make_task_cmds():
-    data_dir_fixtures = f"{tests_dir}/fixtures"
-    data_dir_samples = f"{data_dir_fixtures}/tests_samples"
-    data_dir_wmt = f"{data_dir_samples}/wmt_en_ro"
-    data_dir_xsum = f"{data_dir_samples}/xsum"
+    data_dir_samples = f"{FIXTURE_DIRECTORY}/tests_samples"
+    data_dir_wmt = f"{FIXTURE_DIRECTORY}/wmt_en_ro"
+    data_dir_xsum = f"{FIXTURE_DIRECTORY}/xsum"
     args_main = """
         --do_train
         --max_train_samples 4
@@ -143,7 +141,7 @@ def make_task_cmds():
         ],
     )
 
-    scripts_dir = f"{root_dir}/examples/pytorch"
+    scripts_dir = f"{ROOT_DIRECTORY}/examples/pytorch"
 
     tasks = dict(
         trans=f"""
@@ -161,12 +159,12 @@ def make_task_cmds():
         """,
         clm=f"""
         {scripts_dir}/language-modeling/run_clm.py
-        --train_file {data_dir_fixtures}/sample_text.txt
+        --train_file {FIXTURE_DIRECTORY}/sample_text.txt
         --block_size 8
         """,
         mlm=f"""
         {scripts_dir}/language-modeling/run_mlm.py
-        --train_file {data_dir_fixtures}/sample_text.txt
+        --train_file {FIXTURE_DIRECTORY}/sample_text.txt
         """,
         qa=f"""
         {scripts_dir}/question-answering/run_qa.py

tests/test_feature_extraction_deit.py → tests/deit/test_feature_extraction_deit.py

@@ -21,7 +21,7 @@ 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 .test_feature_extraction_common import FeatureExtractionSavingTestMixin, prepare_image_inputs
+from ..test_feature_extraction_common import FeatureExtractionSavingTestMixin, prepare_image_inputs
 
 
 if is_torch_available():

tests/test_modeling_deit.py → tests/deit/test_modeling_deit.py

@@ -23,8 +23,8 @@ from transformers.file_utils import cached_property, is_torch_available, is_visi
 from transformers.models.auto import get_values
 from transformers.testing_utils import require_torch, require_vision, slow, torch_device
 
-from .test_configuration_common import ConfigTester
-from .test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor
+from ..test_configuration_common import ConfigTester
+from ..test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor
 
 
 if is_torch_available():

tests/test_feature_extraction_detr.py → tests/detr/test_feature_extraction_detr.py

@@ -23,7 +23,7 @@ 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 .test_feature_extraction_common import FeatureExtractionSavingTestMixin, prepare_image_inputs
+from ..test_feature_extraction_common import FeatureExtractionSavingTestMixin, prepare_image_inputs
 
 
 if is_torch_available():

tests/test_modeling_detr.py → tests/detr/test_modeling_detr.py

@@ -23,9 +23,9 @@ 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 .test_configuration_common import ConfigTester
-from .test_generation_utils import GenerationTesterMixin
-from .test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor
+from ..generation.test_generation_utils import GenerationTesterMixin
+from ..test_configuration_common import ConfigTester
+from ..test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor
 
 
 if is_timm_available():

tests/test_modeling_distilbert.py → tests/distilbert/test_modeling_distilbert.py

@@ -19,8 +19,8 @@ import unittest
 from transformers import DistilBertConfig, is_torch_available
 from transformers.testing_utils import require_torch, require_torch_gpu, slow, torch_device
 
-from .test_configuration_common import ConfigTester
-from .test_modeling_common import ModelTesterMixin, ids_tensor, random_attention_mask
+from ..test_configuration_common import ConfigTester
+from ..test_modeling_common import ModelTesterMixin, ids_tensor, random_attention_mask
 
 
 if is_torch_available():

tests/test_modeling_flax_distilbert.py → tests/distilbert/test_modeling_flax_distilbert.py

@@ -19,7 +19,7 @@ import numpy as np
 from transformers import DistilBertConfig, is_flax_available
 from transformers.testing_utils import require_flax, slow
 
-from .test_modeling_flax_common import FlaxModelTesterMixin, ids_tensor, random_attention_mask
+from ..test_modeling_flax_common import FlaxModelTesterMixin, ids_tensor, random_attention_mask
 
 
 if is_flax_available():

tests/test_modeling_tf_distilbert.py → tests/distilbert/test_modeling_tf_distilbert.py

@@ -19,8 +19,8 @@ import unittest
 from transformers import DistilBertConfig, is_tf_available
 from transformers.testing_utils import require_tf, slow
 
-from .test_configuration_common import ConfigTester
-from .test_modeling_tf_common import TFModelTesterMixin, ids_tensor
+from ..test_configuration_common import ConfigTester
+from ..test_modeling_tf_common import TFModelTesterMixin, ids_tensor
 
 
 if is_tf_available():