Unverified Commit 29c10a41 authored by Lysandre Debut's avatar Lysandre Debut Committed by GitHub
Browse files

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



* Per-folder tests reorganization
Co-authored-by: default avatarsgugger <sylvain.gugger@gmail.com>
Co-authored-by: default avatarStas Bekman <stas@stason.org>
parent fecb08c2
...@@ -23,7 +23,7 @@ import numpy as np ...@@ -23,7 +23,7 @@ import numpy as np
from transformers import is_speech_available from transformers import is_speech_available
from transformers.testing_utils import require_torch, require_torchaudio from transformers.testing_utils import require_torch, require_torchaudio
from .test_sequence_feature_extraction_common import SequenceFeatureExtractionTestMixin from ..test_sequence_feature_extraction_common import SequenceFeatureExtractionTestMixin
if is_speech_available(): if is_speech_available():
......
...@@ -32,9 +32,9 @@ from transformers.testing_utils import ( ...@@ -32,9 +32,9 @@ from transformers.testing_utils import (
torch_device, torch_device,
) )
from .test_configuration_common import ConfigTester from ..generation.test_generation_utils import GenerationTesterMixin
from .test_generation_utils import GenerationTesterMixin from ..test_configuration_common import ConfigTester
from .test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor, ids_tensor from ..test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor, ids_tensor
if is_torch_available(): if is_torch_available():
......
...@@ -21,8 +21,8 @@ from transformers import Speech2TextConfig ...@@ -21,8 +21,8 @@ from transformers import Speech2TextConfig
from transformers.file_utils import cached_property, is_tf_available from transformers.file_utils import cached_property, is_tf_available
from transformers.testing_utils import require_sentencepiece, require_tf, require_tokenizers, slow from transformers.testing_utils import require_sentencepiece, require_tf, require_tokenizers, slow
from .test_configuration_common import ConfigTester from ..test_configuration_common import ConfigTester
from .test_modeling_tf_common import TFModelTesterMixin, floats_tensor, ids_tensor from ..test_modeling_tf_common import TFModelTesterMixin, floats_tensor, ids_tensor
if is_tf_available(): if is_tf_available():
......
...@@ -16,6 +16,7 @@ import os ...@@ -16,6 +16,7 @@ import os
import shutil import shutil
import tempfile import tempfile
import unittest import unittest
from os.path import dirname
from pathlib import Path from pathlib import Path
from shutil import copyfile from shutil import copyfile
...@@ -31,7 +32,7 @@ if is_speech_available(): ...@@ -31,7 +32,7 @@ if is_speech_available():
from transformers import Speech2TextFeatureExtractor, Speech2TextProcessor from transformers import Speech2TextFeatureExtractor, Speech2TextProcessor
SAMPLE_SP = os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures/test_sentencepiece.model") SAMPLE_SP = os.path.join(dirname(dirname(os.path.abspath(__file__))), "fixtures/test_sentencepiece.model")
@require_torch @require_torch
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
import os import os
import unittest import unittest
from os.path import dirname
from pathlib import Path from pathlib import Path
from shutil import copyfile from shutil import copyfile
...@@ -22,10 +23,10 @@ from transformers.models.speech_to_text import Speech2TextTokenizer ...@@ -22,10 +23,10 @@ from transformers.models.speech_to_text import Speech2TextTokenizer
from transformers.models.speech_to_text.tokenization_speech_to_text import VOCAB_FILES_NAMES, save_json from transformers.models.speech_to_text.tokenization_speech_to_text import VOCAB_FILES_NAMES, save_json
from transformers.testing_utils import require_sentencepiece, require_tokenizers, slow from transformers.testing_utils import require_sentencepiece, require_tokenizers, slow
from .test_tokenization_common import TokenizerTesterMixin from ..test_tokenization_common import TokenizerTesterMixin
SAMPLE_SP = os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures/test_sentencepiece.model") SAMPLE_SP = os.path.join(dirname(dirname(os.path.abspath(__file__))), "fixtures/test_sentencepiece.model")
if is_sentencepiece_available(): if is_sentencepiece_available():
import sentencepiece as sp import sentencepiece as sp
......
...@@ -19,9 +19,9 @@ import unittest ...@@ -19,9 +19,9 @@ import unittest
from transformers import Speech2Text2Config from transformers import Speech2Text2Config
from transformers.testing_utils import is_torch_available, require_torch, torch_device from transformers.testing_utils import is_torch_available, require_torch, torch_device
from .test_configuration_common import ConfigTester from ..generation.test_generation_utils import GenerationTesterMixin
from .test_generation_utils import GenerationTesterMixin from ..test_configuration_common import ConfigTester
from .test_modeling_common import ModelTesterMixin, ids_tensor from ..test_modeling_common import ModelTesterMixin, ids_tensor
if is_torch_available(): if is_torch_available():
......
...@@ -21,7 +21,7 @@ import unittest ...@@ -21,7 +21,7 @@ import unittest
from transformers.models.speech_to_text_2 import Speech2Text2Tokenizer from transformers.models.speech_to_text_2 import Speech2Text2Tokenizer
from transformers.models.speech_to_text_2.tokenization_speech_to_text_2 import VOCAB_FILES_NAMES from transformers.models.speech_to_text_2.tokenization_speech_to_text_2 import VOCAB_FILES_NAMES
from .test_tokenization_common import TokenizerTesterMixin from ..test_tokenization_common import TokenizerTesterMixin
class SpeechToTextTokenizerTest(TokenizerTesterMixin, unittest.TestCase): class SpeechToTextTokenizerTest(TokenizerTesterMixin, unittest.TestCase):
......
...@@ -20,8 +20,8 @@ import unittest ...@@ -20,8 +20,8 @@ import unittest
from transformers import is_torch_available from transformers import is_torch_available
from transformers.testing_utils import require_torch, slow, torch_device from transformers.testing_utils import require_torch, slow, torch_device
from .test_configuration_common import ConfigTester from ..test_configuration_common import ConfigTester
from .test_modeling_common import ModelTesterMixin, ids_tensor, random_attention_mask from ..test_modeling_common import ModelTesterMixin, ids_tensor, random_attention_mask
if is_torch_available(): if is_torch_available():
......
...@@ -19,8 +19,8 @@ import unittest ...@@ -19,8 +19,8 @@ import unittest
from transformers import SqueezeBertConfig, is_torch_available from transformers import SqueezeBertConfig, is_torch_available
from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow, torch_device from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow, torch_device
from .test_configuration_common import ConfigTester from ..test_configuration_common import ConfigTester
from .test_modeling_common import ModelTesterMixin, ids_tensor, random_attention_mask from ..test_modeling_common import ModelTesterMixin, ids_tensor, random_attention_mask
if is_torch_available(): if is_torch_available():
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
from transformers import SqueezeBertTokenizer, SqueezeBertTokenizerFast from transformers import SqueezeBertTokenizer, SqueezeBertTokenizerFast
from transformers.testing_utils import require_tokenizers, slow from transformers.testing_utils import require_tokenizers, slow
from .test_tokenization_bert import BertTokenizationTest from ..bert.test_tokenization_bert import BertTokenizationTest
@require_tokenizers @require_tokenizers
......
...@@ -18,13 +18,12 @@ import copy ...@@ -18,13 +18,12 @@ import copy
import inspect import inspect
import unittest import unittest
from tests.test_modeling_common import floats_tensor
from transformers import SwinConfig from transformers import SwinConfig
from transformers.file_utils import cached_property, is_torch_available, is_vision_available 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.testing_utils import require_torch, require_vision, slow, torch_device
from .test_configuration_common import ConfigTester from ..test_configuration_common import ConfigTester
from .test_modeling_common import ModelTesterMixin, ids_tensor from ..test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor
if is_torch_available(): if is_torch_available():
......
...@@ -27,9 +27,9 @@ from transformers.testing_utils import ( ...@@ -27,9 +27,9 @@ from transformers.testing_utils import (
slow, slow,
) )
from .test_configuration_common import ConfigTester from ..generation.test_generation_flax_utils import FlaxGenerationTesterMixin
from .test_generation_flax_utils import FlaxGenerationTesterMixin from ..test_configuration_common import ConfigTester
from .test_modeling_flax_common import FlaxModelTesterMixin, ids_tensor from ..test_modeling_flax_common import FlaxModelTesterMixin, ids_tensor
if is_flax_available(): if is_flax_available():
......
...@@ -22,9 +22,9 @@ from transformers import T5Config, is_torch_available ...@@ -22,9 +22,9 @@ from transformers import T5Config, is_torch_available
from transformers.file_utils import cached_property from transformers.file_utils import cached_property
from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow, torch_device from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow, torch_device
from .test_configuration_common import ConfigTester from ..generation.test_generation_utils import GenerationTesterMixin
from .test_generation_utils import GenerationTesterMixin from ..test_configuration_common import ConfigTester
from .test_modeling_common import ModelTesterMixin, ids_tensor from ..test_modeling_common import ModelTesterMixin, ids_tensor
if is_torch_available(): if is_torch_available():
......
...@@ -19,8 +19,8 @@ from transformers import T5Config, is_tf_available ...@@ -19,8 +19,8 @@ from transformers import T5Config, is_tf_available
from transformers.file_utils import cached_property from transformers.file_utils import cached_property
from transformers.testing_utils import require_sentencepiece, require_tf, require_tokenizers, slow from transformers.testing_utils import require_sentencepiece, require_tf, require_tokenizers, slow
from .test_configuration_common import ConfigTester from ..test_configuration_common import ConfigTester
from .test_modeling_tf_common import TFModelTesterMixin, ids_tensor from ..test_modeling_tf_common import TFModelTesterMixin, ids_tensor
if is_tf_available(): if is_tf_available():
......
...@@ -21,7 +21,7 @@ from transformers import SPIECE_UNDERLINE, AddedToken, BatchEncoding, T5Tokenize ...@@ -21,7 +21,7 @@ from transformers import SPIECE_UNDERLINE, AddedToken, BatchEncoding, T5Tokenize
from transformers.file_utils import cached_property, is_tf_available, is_torch_available 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.testing_utils import get_tests_dir, require_sentencepiece, require_tokenizers, slow
from .test_tokenization_common import TokenizerTesterMixin from ..test_tokenization_common import TokenizerTesterMixin
SAMPLE_VOCAB = get_tests_dir("fixtures/test_sentencepiece.model") SAMPLE_VOCAB = get_tests_dir("fixtures/test_sentencepiece.model")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment