diff --git a/docs/source/en/internal/file_utils.md b/docs/source/en/internal/file_utils.md index ae483638653f..31fbc5b88110 100644 --- a/docs/source/en/internal/file_utils.md +++ b/docs/source/en/internal/file_utils.md @@ -41,10 +41,6 @@ Most of those are only useful if you are studying the general code in the librar [[autodoc]] utils.replace_return_docstrings -## Special Properties - -[[autodoc]] utils.cached_property - ## Other Utilities [[autodoc]] utils._LazyModule diff --git a/docs/source/ja/internal/file_utils.md b/docs/source/ja/internal/file_utils.md index 51a025bfc67f..0ecabad3a624 100644 --- a/docs/source/ja/internal/file_utils.md +++ b/docs/source/ja/internal/file_utils.md @@ -40,10 +40,6 @@ rendered properly in your Markdown viewer. [[autodoc]] utils.replace_return_docstrings -## 特殊なプロパティ - -[[autodoc]] utils.cached_property - ## その他のユーティリティ [[autodoc]] utils._LazyModule diff --git a/docs/source/ko/internal/file_utils.md b/docs/source/ko/internal/file_utils.md index 7effad44baa1..6dadfa286797 100644 --- a/docs/source/ko/internal/file_utils.md +++ b/docs/source/ko/internal/file_utils.md @@ -41,10 +41,6 @@ rendered properly in your Markdown viewer. [[autodoc]] utils.replace_return_docstrings -## 특수 속성 (Special Properties) [[transformers.utils.cached_property]] - -[[autodoc]] utils.cached_property - ## 기타 유틸리티 [[transformers.utils._LazyModule]] [[autodoc]] utils._LazyModule diff --git a/docs/source/zh/internal/file_utils.md b/docs/source/zh/internal/file_utils.md index ba4b4902814a..1f099b798694 100644 --- a/docs/source/zh/internal/file_utils.md +++ b/docs/source/zh/internal/file_utils.md @@ -20,7 +20,6 @@ rendered properly in your Markdown viewer. 其中大多数仅在您研究库中的通用代码时才有用。 - ## Enums和namedtuples(命名元组) [[autodoc]] utils.ExplicitEnum @@ -41,10 +40,6 @@ rendered properly in your Markdown viewer. [[autodoc]] utils.replace_return_docstrings -## 特殊的属性 - -[[autodoc]] utils.cached_property - ## 其他实用程序 [[autodoc]] utils._LazyModule diff --git a/src/transformers/file_utils.py b/src/transformers/file_utils.py index ac6b36d2dbcf..fc6f722262d9 100644 --- a/src/transformers/file_utils.py +++ b/src/transformers/file_utils.py @@ -67,7 +67,6 @@ add_end_docstrings, add_start_docstrings, add_start_docstrings_to_model_forward, - cached_property, copy_func, default_cache_path, define_sagemaker_information, diff --git a/src/transformers/sagemaker/training_args_sm.py b/src/transformers/sagemaker/training_args_sm.py index 3daac7859b55..0dcd2adf931d 100644 --- a/src/transformers/sagemaker/training_args_sm.py +++ b/src/transformers/sagemaker/training_args_sm.py @@ -17,11 +17,12 @@ import os import warnings from dataclasses import dataclass, field +from functools import cached_property import torch from ..training_args import TrainingArguments -from ..utils import cached_property, is_sagemaker_dp_enabled, logging +from ..utils import is_sagemaker_dp_enabled, logging logger = logging.get_logger(__name__) diff --git a/src/transformers/training_args.py b/src/transformers/training_args.py index 222620958f8b..aeec8d89f0c0 100644 --- a/src/transformers/training_args.py +++ b/src/transformers/training_args.py @@ -20,6 +20,7 @@ from dataclasses import asdict, dataclass, field, fields from datetime import timedelta from enum import Enum +from functools import cached_property from pathlib import Path from typing import Any, Optional, Union @@ -37,7 +38,6 @@ from .utils import ( ACCELERATE_MIN_VERSION, ExplicitEnum, - cached_property, is_accelerate_available, is_apex_available, is_ipex_available, diff --git a/src/transformers/training_args_tf.py b/src/transformers/training_args_tf.py index cf20503d63cc..24763dabf916 100644 --- a/src/transformers/training_args_tf.py +++ b/src/transformers/training_args_tf.py @@ -14,10 +14,11 @@ import warnings from dataclasses import dataclass, field +from functools import cached_property from typing import Optional from .training_args import TrainingArguments -from .utils import cached_property, is_tf_available, logging, requires_backends +from .utils import is_tf_available, logging, requires_backends logger = logging.get_logger(__name__) diff --git a/src/transformers/utils/__init__.py b/src/transformers/utils/__init__.py index e9df734240a8..1b4671a55e8c 100644 --- a/src/transformers/utils/__init__.py +++ b/src/transformers/utils/__init__.py @@ -51,7 +51,6 @@ PaddingStrategy, TensorType, TransformersKwargs, - cached_property, can_return_loss, can_return_tuple, expand_dims, diff --git a/src/transformers/utils/generic.py b/src/transformers/utils/generic.py index 76d36a745188..65d221fbc4af 100644 --- a/src/transformers/utils/generic.py +++ b/src/transformers/utils/generic.py @@ -53,29 +53,6 @@ from ..model_debugging_utils import model_addition_debugger_context -class cached_property(property): - """ - Descriptor that mimics @property but caches output in member variable. - - From tensorflow_datasets - - Built-in in functools from Python 3.8. - """ - - def __get__(self, obj, objtype=None): - # See docs.python.org/3/howto/descriptor.html#properties - if obj is None: - return self - if self.fget is None: - raise AttributeError("unreadable attribute") - attr = "__cached_" + self.fget.__name__ - cached = getattr(obj, attr, None) - if cached is None: - cached = self.fget(obj) - setattr(obj, attr, cached) - return cached - - # vendored from distutils.util def strtobool(val): """Convert a string representation of truth to true (1) or false (0). diff --git a/tests/models/audio_spectrogram_transformer/test_modeling_audio_spectrogram_transformer.py b/tests/models/audio_spectrogram_transformer/test_modeling_audio_spectrogram_transformer.py index e9919d7dcde1..0e42be15c648 100644 --- a/tests/models/audio_spectrogram_transformer/test_modeling_audio_spectrogram_transformer.py +++ b/tests/models/audio_spectrogram_transformer/test_modeling_audio_spectrogram_transformer.py @@ -15,12 +15,13 @@ import inspect import unittest +from functools import cached_property from huggingface_hub import hf_hub_download from transformers import ASTConfig from transformers.testing_utils import require_torch, require_torchaudio, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_torchaudio_available +from transformers.utils import is_torch_available, is_torchaudio_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/bark/test_modeling_bark.py b/tests/models/bark/test_modeling_bark.py index 9ad0556e1521..115e67d101e0 100644 --- a/tests/models/bark/test_modeling_bark.py +++ b/tests/models/bark/test_modeling_bark.py @@ -17,6 +17,7 @@ import inspect import tempfile import unittest +from functools import cached_property from transformers import ( BarkCausalModel, @@ -39,7 +40,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/bart/test_modeling_bart.py b/tests/models/bart/test_modeling_bart.py index 9d887895b941..048281832c2d 100644 --- a/tests/models/bart/test_modeling_bart.py +++ b/tests/models/bart/test_modeling_bart.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property import timeout_decorator # noqa @@ -28,7 +29,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/bart/test_tokenization_bart.py b/tests/models/bart/test_tokenization_bart.py index 81f142a8a523..18d0755a6e4f 100644 --- a/tests/models/bart/test_tokenization_bart.py +++ b/tests/models/bart/test_tokenization_bart.py @@ -14,11 +14,11 @@ import json import os import unittest +from functools import cached_property from transformers import BartTokenizer, BartTokenizerFast, BatchEncoding from transformers.models.roberta.tokenization_roberta import VOCAB_FILES_NAMES from transformers.testing_utils import require_tokenizers, require_torch -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin, filter_roberta_detectors diff --git a/tests/models/beit/test_modeling_beit.py b/tests/models/beit/test_modeling_beit.py index ff696f8cf607..48bfda0a4d85 100644 --- a/tests/models/beit/test_modeling_beit.py +++ b/tests/models/beit/test_modeling_beit.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch BEiT model.""" import unittest +from functools import cached_property import pytest from datasets import load_dataset @@ -27,7 +28,6 @@ torch_device, ) from transformers.utils import ( - cached_property, is_torch_available, is_vision_available, ) diff --git a/tests/models/bert_generation/test_tokenization_bert_generation.py b/tests/models/bert_generation/test_tokenization_bert_generation.py index 948ca66e3f80..c23d8a2cc38e 100644 --- a/tests/models/bert_generation/test_tokenization_bert_generation.py +++ b/tests/models/bert_generation/test_tokenization_bert_generation.py @@ -13,10 +13,10 @@ # limitations under the License. import unittest +from functools import cached_property from transformers import BertGenerationTokenizer from transformers.testing_utils import get_tests_dir, require_sentencepiece, require_torch, slow -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/big_bird/test_tokenization_big_bird.py b/tests/models/big_bird/test_tokenization_big_bird.py index ef53889fa1dc..09ad1fe992dc 100644 --- a/tests/models/big_bird/test_tokenization_big_bird.py +++ b/tests/models/big_bird/test_tokenization_big_bird.py @@ -13,10 +13,10 @@ # limitations under the License. import unittest +from functools import cached_property from transformers import BigBirdTokenizer, BigBirdTokenizerFast from transformers.testing_utils import get_tests_dir, require_sentencepiece, require_tokenizers, require_torch, slow -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/bit/test_modeling_bit.py b/tests/models/bit/test_modeling_bit.py index b8e09fa4098d..aa616c85aa6c 100644 --- a/tests/models/bit/test_modeling_bit.py +++ b/tests/models/bit/test_modeling_bit.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch Bit model.""" import unittest +from functools import cached_property from transformers import BitConfig 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 transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/blenderbot/test_modeling_blenderbot.py b/tests/models/blenderbot/test_modeling_blenderbot.py index bec16cf5dc13..a6dcaaecc412 100644 --- a/tests/models/blenderbot/test_modeling_blenderbot.py +++ b/tests/models/blenderbot/test_modeling_blenderbot.py @@ -15,6 +15,7 @@ import tempfile import unittest +from functools import cached_property from transformers import BlenderbotConfig, is_torch_available from transformers.testing_utils import ( @@ -26,7 +27,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/blenderbot/test_tokenization_blenderbot.py b/tests/models/blenderbot/test_tokenization_blenderbot.py index 79fb8fe0623d..0997ac4bde41 100644 --- a/tests/models/blenderbot/test_tokenization_blenderbot.py +++ b/tests/models/blenderbot/test_tokenization_blenderbot.py @@ -15,10 +15,10 @@ """Tests for Blenderbot Tokenizers, including common tests for BlenderbotSmallTokenizer.""" import unittest +from functools import cached_property from transformers import BlenderbotTokenizer, BlenderbotTokenizerFast from transformers.testing_utils import require_jinja -from transformers.utils import cached_property class Blenderbot3BTokenizerTests(unittest.TestCase): diff --git a/tests/models/blenderbot_small/test_modeling_blenderbot_small.py b/tests/models/blenderbot_small/test_modeling_blenderbot_small.py index 5a05fd574684..f4f29c6c0a75 100644 --- a/tests/models/blenderbot_small/test_modeling_blenderbot_small.py +++ b/tests/models/blenderbot_small/test_modeling_blenderbot_small.py @@ -15,6 +15,7 @@ import tempfile import unittest +from functools import cached_property from transformers import BlenderbotSmallConfig, is_torch_available from transformers.testing_utils import ( @@ -23,7 +24,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/bridgetower/test_modeling_bridgetower.py b/tests/models/bridgetower/test_modeling_bridgetower.py index b0c26f1e7d2a..59147a9d26a8 100644 --- a/tests/models/bridgetower/test_modeling_bridgetower.py +++ b/tests/models/bridgetower/test_modeling_bridgetower.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch BridgeTower model.""" import unittest +from functools import cached_property from transformers import ( BridgeTowerConfig, @@ -23,7 +24,6 @@ is_vision_available, ) from transformers.testing_utils import require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ( diff --git a/tests/models/byt5/test_tokenization_byt5.py b/tests/models/byt5/test_tokenization_byt5.py index a6eba6231d59..35dd95424dcc 100644 --- a/tests/models/byt5/test_tokenization_byt5.py +++ b/tests/models/byt5/test_tokenization_byt5.py @@ -18,9 +18,10 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import AddedToken, BatchEncoding, ByT5Tokenizer -from transformers.utils import cached_property, is_tf_available, is_torch_available +from transformers.utils import is_tf_available, is_torch_available from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/canine/test_tokenization_canine.py b/tests/models/canine/test_tokenization_canine.py index adcceb6b732b..d9f7154a432d 100644 --- a/tests/models/canine/test_tokenization_canine.py +++ b/tests/models/canine/test_tokenization_canine.py @@ -17,11 +17,11 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import BatchEncoding, CanineTokenizer from transformers.testing_utils import require_tokenizers, require_torch from transformers.tokenization_utils import AddedToken -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/codegen/test_modeling_codegen.py b/tests/models/codegen/test_modeling_codegen.py index 78f766a52acd..ee16a5347ad6 100644 --- a/tests/models/codegen/test_modeling_codegen.py +++ b/tests/models/codegen/test_modeling_codegen.py @@ -14,9 +14,9 @@ import unittest +from functools import cached_property from transformers import CodeGenConfig, is_torch_available -from transformers.file_utils import cached_property from transformers.testing_utils import backend_manual_seed, require_torch, slow, torch_device from ...generation.test_utils import GenerationTesterMixin diff --git a/tests/models/conditional_detr/test_modeling_conditional_detr.py b/tests/models/conditional_detr/test_modeling_conditional_detr.py index 954cdccf8fe9..a2d962a85a0f 100644 --- a/tests/models/conditional_detr/test_modeling_conditional_detr.py +++ b/tests/models/conditional_detr/test_modeling_conditional_detr.py @@ -16,10 +16,10 @@ import inspect import math import unittest +from functools import cached_property from transformers import ConditionalDetrConfig, ResNetConfig, is_torch_available, is_vision_available from transformers.testing_utils import require_timm, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor diff --git a/tests/models/convnext/test_modeling_convnext.py b/tests/models/convnext/test_modeling_convnext.py index f87213a72de8..51a078abae02 100644 --- a/tests/models/convnext/test_modeling_convnext.py +++ b/tests/models/convnext/test_modeling_convnext.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch ConvNext model.""" import unittest +from functools import cached_property from transformers import ConvNextConfig 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 transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/convnextv2/test_modeling_convnextv2.py b/tests/models/convnextv2/test_modeling_convnextv2.py index f24b33c439fb..7ea8e684988c 100644 --- a/tests/models/convnextv2/test_modeling_convnextv2.py +++ b/tests/models/convnextv2/test_modeling_convnextv2.py @@ -14,12 +14,13 @@ """Testing suite for the PyTorch ConvNextV2 model.""" import unittest +from functools import cached_property from transformers import ConvNextV2Config from transformers.models.auto import get_values from transformers.models.auto.modeling_auto import MODEL_FOR_BACKBONE_MAPPING_NAMES, MODEL_MAPPING_NAMES 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 transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/cvt/test_modeling_cvt.py b/tests/models/cvt/test_modeling_cvt.py index f0b6b414335b..eb2940a75ac2 100644 --- a/tests/models/cvt/test_modeling_cvt.py +++ b/tests/models/cvt/test_modeling_cvt.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch CvT model.""" import unittest +from functools import cached_property from math import floor from transformers import CvtConfig -from transformers.file_utils import cached_property, is_torch_available, is_vision_available +from transformers.file_utils import is_torch_available, is_vision_available from transformers.testing_utils import require_torch, require_vision, slow, torch_device from ...test_configuration_common import ConfigTester diff --git a/tests/models/d_fine/test_modeling_d_fine.py b/tests/models/d_fine/test_modeling_d_fine.py index ab5c34444ce2..7c381b8f6ae4 100644 --- a/tests/models/d_fine/test_modeling_d_fine.py +++ b/tests/models/d_fine/test_modeling_d_fine.py @@ -18,6 +18,7 @@ import math import tempfile import unittest +from functools import cached_property from parameterized import parameterized @@ -34,7 +35,6 @@ slow, torch_device, ) -from transformers.utils import cached_property if is_torch_available(): diff --git a/tests/models/dab_detr/test_modeling_dab_detr.py b/tests/models/dab_detr/test_modeling_dab_detr.py index 442a984d71de..6f437ce7692d 100644 --- a/tests/models/dab_detr/test_modeling_dab_detr.py +++ b/tests/models/dab_detr/test_modeling_dab_detr.py @@ -16,10 +16,10 @@ import inspect import math import unittest +from functools import cached_property from transformers import DabDetrConfig, ResNetConfig, is_torch_available, is_vision_available from transformers.testing_utils import require_timm, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor diff --git a/tests/models/data2vec/test_modeling_data2vec_vision.py b/tests/models/data2vec/test_modeling_data2vec_vision.py index 709436ce1419..aebbe183cacf 100644 --- a/tests/models/data2vec/test_modeling_data2vec_vision.py +++ b/tests/models/data2vec/test_modeling_data2vec_vision.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch Data2VecVision model.""" import unittest +from functools import cached_property import pytest @@ -26,7 +27,6 @@ torch_device, ) from transformers.utils import ( - cached_property, is_torch_available, is_vision_available, ) diff --git a/tests/models/deformable_detr/test_modeling_deformable_detr.py b/tests/models/deformable_detr/test_modeling_deformable_detr.py index bbe97b9520b7..14fa0994ebee 100644 --- a/tests/models/deformable_detr/test_modeling_deformable_detr.py +++ b/tests/models/deformable_detr/test_modeling_deformable_detr.py @@ -16,9 +16,9 @@ import inspect import math import unittest +from functools import cached_property from transformers import DeformableDetrConfig, ResNetConfig, is_torch_available, is_vision_available -from transformers.file_utils import cached_property from transformers.testing_utils import ( require_timm, require_torch, diff --git a/tests/models/deit/test_modeling_deit.py b/tests/models/deit/test_modeling_deit.py index 62058592e78e..1b3a59559bf4 100644 --- a/tests/models/deit/test_modeling_deit.py +++ b/tests/models/deit/test_modeling_deit.py @@ -15,6 +15,7 @@ import unittest import warnings +from functools import cached_property from transformers import DeiTConfig from transformers.testing_utils import ( @@ -26,7 +27,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/detr/test_modeling_detr.py b/tests/models/detr/test_modeling_detr.py index 3ca48f8002ef..dcad75307691 100644 --- a/tests/models/detr/test_modeling_detr.py +++ b/tests/models/detr/test_modeling_detr.py @@ -16,10 +16,10 @@ import inspect import math import unittest +from functools import cached_property from transformers import DetrConfig, ResNetConfig, is_torch_available, is_vision_available from transformers.testing_utils import Expectations, require_timm, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor diff --git a/tests/models/dinat/test_modeling_dinat.py b/tests/models/dinat/test_modeling_dinat.py index 1de68988e726..4ffe5f6cd692 100644 --- a/tests/models/dinat/test_modeling_dinat.py +++ b/tests/models/dinat/test_modeling_dinat.py @@ -15,10 +15,11 @@ import collections import unittest +from functools import cached_property from transformers import DinatConfig from transformers.testing_utils import require_natten, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/dinov2/test_modeling_dinov2.py b/tests/models/dinov2/test_modeling_dinov2.py index 07490a22f640..2377bc1d2ee2 100644 --- a/tests/models/dinov2/test_modeling_dinov2.py +++ b/tests/models/dinov2/test_modeling_dinov2.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch Dinov2 model.""" import unittest +from functools import cached_property from transformers import Dinov2Config from transformers.testing_utils import ( @@ -23,7 +24,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/dinov2_with_registers/test_modeling_dinov2_with_registers.py b/tests/models/dinov2_with_registers/test_modeling_dinov2_with_registers.py index c5701d508804..b9f0f5fecfe0 100644 --- a/tests/models/dinov2_with_registers/test_modeling_dinov2_with_registers.py +++ b/tests/models/dinov2_with_registers/test_modeling_dinov2_with_registers.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch Dinov2WithRegisters model.""" import unittest +from functools import cached_property from transformers import Dinov2WithRegistersConfig from transformers.testing_utils import ( @@ -22,7 +23,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/dinov3_convnext/test_modeling_dinov3_convnext.py b/tests/models/dinov3_convnext/test_modeling_dinov3_convnext.py index a34aacbd8e97..0ecbc3a6c4f5 100644 --- a/tests/models/dinov3_convnext/test_modeling_dinov3_convnext.py +++ b/tests/models/dinov3_convnext/test_modeling_dinov3_convnext.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch ConvNext model.""" import unittest +from functools import cached_property from transformers import DINOv3ConvNextConfig 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 transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/dinov3_vit/test_modeling_dinov3_vit.py b/tests/models/dinov3_vit/test_modeling_dinov3_vit.py index 00e078739d88..f0b8c92d22a0 100644 --- a/tests/models/dinov3_vit/test_modeling_dinov3_vit.py +++ b/tests/models/dinov3_vit/test_modeling_dinov3_vit.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch DINOv3 model.""" import unittest +from functools import cached_property from transformers import DINOv3ViTConfig 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 transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor, ids_tensor diff --git a/tests/models/efficientloftr/test_modeling_efficientloftr.py b/tests/models/efficientloftr/test_modeling_efficientloftr.py index bbc0c3980618..aef77ac85686 100644 --- a/tests/models/efficientloftr/test_modeling_efficientloftr.py +++ b/tests/models/efficientloftr/test_modeling_efficientloftr.py @@ -13,7 +13,7 @@ # limitations under the License. import inspect import unittest -from functools import reduce +from functools import cached_property, reduce from datasets import load_dataset @@ -27,7 +27,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor diff --git a/tests/models/efficientnet/test_modeling_efficientnet.py b/tests/models/efficientnet/test_modeling_efficientnet.py index f0706ad1536a..5d7cc2ce5268 100644 --- a/tests/models/efficientnet/test_modeling_efficientnet.py +++ b/tests/models/efficientnet/test_modeling_efficientnet.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch EfficientNet model.""" import unittest +from functools import cached_property from transformers import EfficientNetConfig from transformers.testing_utils import is_pipeline_test, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/evolla/test_modeling_evolla.py b/tests/models/evolla/test_modeling_evolla.py index 8077e627413f..50574c7c5096 100644 --- a/tests/models/evolla/test_modeling_evolla.py +++ b/tests/models/evolla/test_modeling_evolla.py @@ -15,6 +15,7 @@ """Testing suite for the PyTorch Evolla model.""" import unittest +from functools import cached_property from parameterized import parameterized @@ -26,9 +27,6 @@ slow, torch_device, ) -from transformers.utils import ( - cached_property, -) from ...test_configuration_common import ConfigTester from ...test_modeling_common import ( diff --git a/tests/models/focalnet/test_modeling_focalnet.py b/tests/models/focalnet/test_modeling_focalnet.py index 893d9ed1ee6f..f4dac79f9ca0 100644 --- a/tests/models/focalnet/test_modeling_focalnet.py +++ b/tests/models/focalnet/test_modeling_focalnet.py @@ -15,10 +15,11 @@ import collections import unittest +from functools import cached_property from transformers import FocalNetConfig from transformers.testing_utils import Expectations, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/fsmt/test_modeling_fsmt.py b/tests/models/fsmt/test_modeling_fsmt.py index aaf3e0e91ac8..39a2d5b26a24 100644 --- a/tests/models/fsmt/test_modeling_fsmt.py +++ b/tests/models/fsmt/test_modeling_fsmt.py @@ -14,6 +14,7 @@ import tempfile import unittest +from functools import cached_property import timeout_decorator # noqa from parameterized import parameterized @@ -27,7 +28,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/fsmt/test_tokenization_fsmt.py b/tests/models/fsmt/test_tokenization_fsmt.py index bfaf3df19593..21e5ff37bec3 100644 --- a/tests/models/fsmt/test_tokenization_fsmt.py +++ b/tests/models/fsmt/test_tokenization_fsmt.py @@ -16,10 +16,10 @@ import json import os import unittest +from functools 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 diff --git a/tests/models/fuyu/test_modeling_fuyu.py b/tests/models/fuyu/test_modeling_fuyu.py index ee3de73bf2cb..02d978fac250 100644 --- a/tests/models/fuyu/test_modeling_fuyu.py +++ b/tests/models/fuyu/test_modeling_fuyu.py @@ -16,6 +16,7 @@ import copy import io import unittest +from functools import cached_property import pytest import requests @@ -24,7 +25,6 @@ from transformers import FuyuConfig, is_torch_available, is_vision_available from transformers.testing_utils import require_torch, require_torch_accelerator, slow, torch_device -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor, random_attention_mask diff --git a/tests/models/gpt_neo/test_modeling_gpt_neo.py b/tests/models/gpt_neo/test_modeling_gpt_neo.py index fc552ab4afea..d87a41b0bd70 100644 --- a/tests/models/gpt_neo/test_modeling_gpt_neo.py +++ b/tests/models/gpt_neo/test_modeling_gpt_neo.py @@ -14,10 +14,10 @@ """Testing suite for the PyTorch GPT Neo model.""" import unittest +from functools import cached_property from transformers import GPTNeoConfig, is_torch_available from transformers.testing_utils import require_torch, slow, torch_device -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/grounding_dino/test_modeling_grounding_dino.py b/tests/models/grounding_dino/test_modeling_grounding_dino.py index b68b5810ac17..320c50830eaf 100644 --- a/tests/models/grounding_dino/test_modeling_grounding_dino.py +++ b/tests/models/grounding_dino/test_modeling_grounding_dino.py @@ -18,6 +18,7 @@ import math import re import unittest +from functools import cached_property from datasets import load_dataset @@ -27,7 +28,6 @@ is_torch_available, is_vision_available, ) -from transformers.file_utils import cached_property from transformers.testing_utils import ( Expectations, is_flaky, diff --git a/tests/models/hiera/test_modeling_hiera.py b/tests/models/hiera/test_modeling_hiera.py index 8a79e9afa8a6..e4c43237584f 100644 --- a/tests/models/hiera/test_modeling_hiera.py +++ b/tests/models/hiera/test_modeling_hiera.py @@ -15,6 +15,7 @@ import math import unittest +from functools import cached_property from transformers import HieraConfig from transformers.testing_utils import ( @@ -24,7 +25,6 @@ torch_device, ) from transformers.utils import ( - cached_property, is_torch_available, is_vision_available, ) diff --git a/tests/models/idefics/test_modeling_idefics.py b/tests/models/idefics/test_modeling_idefics.py index 33ba384511c2..2cf220fd6dfd 100644 --- a/tests/models/idefics/test_modeling_idefics.py +++ b/tests/models/idefics/test_modeling_idefics.py @@ -15,6 +15,7 @@ import inspect import unittest +from functools import cached_property import pytest from parameterized import parameterized @@ -28,7 +29,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/ijepa/test_modeling_ijepa.py b/tests/models/ijepa/test_modeling_ijepa.py index f745e44e594f..cdfaa0ebca35 100644 --- a/tests/models/ijepa/test_modeling_ijepa.py +++ b/tests/models/ijepa/test_modeling_ijepa.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch IJEPA model.""" import unittest +from functools import cached_property from transformers import IJepaConfig from transformers.testing_utils import ( @@ -26,7 +27,6 @@ torch_device, ) from transformers.utils import ( - cached_property, is_torch_available, is_vision_available, ) diff --git a/tests/models/imagegpt/test_modeling_imagegpt.py b/tests/models/imagegpt/test_modeling_imagegpt.py index c20d00e73372..1c10ed0797db 100644 --- a/tests/models/imagegpt/test_modeling_imagegpt.py +++ b/tests/models/imagegpt/test_modeling_imagegpt.py @@ -15,10 +15,11 @@ import inspect import unittest +from functools import cached_property from transformers import ImageGPTConfig from transformers.testing_utils import require_torch, require_vision, run_test_using_subprocess, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/layoutlmv2/test_processing_layoutlmv2.py b/tests/models/layoutlmv2/test_processing_layoutlmv2.py index cdc0bfe7208e..dc441b3030c0 100644 --- a/tests/models/layoutlmv2/test_processing_layoutlmv2.py +++ b/tests/models/layoutlmv2/test_processing_layoutlmv2.py @@ -17,12 +17,13 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import PreTrainedTokenizer, PreTrainedTokenizerBase, PreTrainedTokenizerFast from transformers.models.layoutlmv2 import LayoutLMv2Processor, 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 +from transformers.utils import FEATURE_EXTRACTOR_NAME, is_pytesseract_available from ...test_processing_common import ProcessorTesterMixin diff --git a/tests/models/layoutlmv3/test_modeling_layoutlmv3.py b/tests/models/layoutlmv3/test_modeling_layoutlmv3.py index 7fa143d0d321..e63ec1b5eb9d 100644 --- a/tests/models/layoutlmv3/test_modeling_layoutlmv3.py +++ b/tests/models/layoutlmv3/test_modeling_layoutlmv3.py @@ -15,10 +15,11 @@ import copy import unittest +from functools import cached_property from transformers.models.auto import get_values from transformers.testing_utils import require_torch, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor, random_attention_mask diff --git a/tests/models/layoutlmv3/test_processing_layoutlmv3.py b/tests/models/layoutlmv3/test_processing_layoutlmv3.py index eaba5fcfa557..cf44966327d3 100644 --- a/tests/models/layoutlmv3/test_processing_layoutlmv3.py +++ b/tests/models/layoutlmv3/test_processing_layoutlmv3.py @@ -17,12 +17,13 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import PreTrainedTokenizer, PreTrainedTokenizerBase, PreTrainedTokenizerFast from transformers.models.layoutlmv3 import LayoutLMv3Processor, LayoutLMv3Tokenizer, LayoutLMv3TokenizerFast from transformers.models.layoutlmv3.tokenization_layoutlmv3 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 +from transformers.utils import FEATURE_EXTRACTOR_NAME, is_pytesseract_available from ...test_processing_common import ProcessorTesterMixin diff --git a/tests/models/layoutxlm/test_processing_layoutxlm.py b/tests/models/layoutxlm/test_processing_layoutxlm.py index 9638bef1b2d4..29a3687ebf0e 100644 --- a/tests/models/layoutxlm/test_processing_layoutxlm.py +++ b/tests/models/layoutxlm/test_processing_layoutxlm.py @@ -17,6 +17,7 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import PreTrainedTokenizer, PreTrainedTokenizerBase, PreTrainedTokenizerFast from transformers.models.layoutxlm import LayoutXLMProcessor, LayoutXLMTokenizer, LayoutXLMTokenizerFast @@ -27,7 +28,7 @@ require_torch, slow, ) -from transformers.utils import FEATURE_EXTRACTOR_NAME, cached_property, is_pytesseract_available +from transformers.utils import FEATURE_EXTRACTOR_NAME, is_pytesseract_available from ...test_processing_common import ProcessorTesterMixin diff --git a/tests/models/led/test_modeling_led.py b/tests/models/led/test_modeling_led.py index 60a10eb860b2..4724bf9cb9b9 100644 --- a/tests/models/led/test_modeling_led.py +++ b/tests/models/led/test_modeling_led.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property from transformers import LEDConfig, is_torch_available from transformers.models.auto import get_values @@ -27,7 +28,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/led/test_tokenization_led.py b/tests/models/led/test_tokenization_led.py index 5290138d5730..05b2cfcde335 100644 --- a/tests/models/led/test_tokenization_led.py +++ b/tests/models/led/test_tokenization_led.py @@ -14,11 +14,11 @@ import json import os import unittest +from functools import cached_property from transformers import BatchEncoding, LEDTokenizer, LEDTokenizerFast from transformers.models.led.tokenization_led import VOCAB_FILES_NAMES from transformers.testing_utils import require_tokenizers, require_torch -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/levit/test_modeling_levit.py b/tests/models/levit/test_modeling_levit.py index e017cba05a85..0f12d0b14e2d 100644 --- a/tests/models/levit/test_modeling_levit.py +++ b/tests/models/levit/test_modeling_levit.py @@ -15,10 +15,11 @@ import unittest import warnings +from functools import cached_property from math import ceil, floor from transformers import LevitConfig -from transformers.file_utils import cached_property, is_torch_available, is_vision_available +from transformers.file_utils import is_torch_available, is_vision_available from transformers.testing_utils import Expectations, require_torch, require_vision, slow, torch_device from ...test_configuration_common import ConfigTester diff --git a/tests/models/lightglue/test_modeling_lightglue.py b/tests/models/lightglue/test_modeling_lightglue.py index 7f36469bf537..17276f1cdefd 100644 --- a/tests/models/lightglue/test_modeling_lightglue.py +++ b/tests/models/lightglue/test_modeling_lightglue.py @@ -13,12 +13,13 @@ # limitations under the License. import inspect import unittest +from functools import cached_property from datasets import load_dataset from transformers.models.lightglue.configuration_lightglue import LightGlueConfig from transformers.testing_utils import get_device_properties, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor diff --git a/tests/models/longt5/test_modeling_longt5.py b/tests/models/longt5/test_modeling_longt5.py index c43050c462f4..f7393df7d2f4 100644 --- a/tests/models/longt5/test_modeling_longt5.py +++ b/tests/models/longt5/test_modeling_longt5.py @@ -16,11 +16,11 @@ import copy import tempfile import unittest +from functools import cached_property from transformers import LongT5Config, is_torch_available from transformers.models.auto import get_values from transformers.testing_utils import require_sentencepiece, require_tokenizers, require_torch, slow, torch_device -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/m2m_100/test_modeling_m2m_100.py b/tests/models/m2m_100/test_modeling_m2m_100.py index fb6e96659025..20cd88baa534 100644 --- a/tests/models/m2m_100/test_modeling_m2m_100.py +++ b/tests/models/m2m_100/test_modeling_m2m_100.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property import pytest @@ -30,7 +31,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/marian/test_modeling_marian.py b/tests/models/marian/test_modeling_marian.py index 99afab0843b2..8f938cb7b0f7 100644 --- a/tests/models/marian/test_modeling_marian.py +++ b/tests/models/marian/test_modeling_marian.py @@ -15,6 +15,7 @@ import tempfile import unittest +from functools import cached_property from transformers import MarianConfig, is_torch_available from transformers.testing_utils import ( @@ -25,7 +26,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/markuplm/test_modeling_markuplm.py b/tests/models/markuplm/test_modeling_markuplm.py index 7bec38704e31..0f5b31dffb7c 100644 --- a/tests/models/markuplm/test_modeling_markuplm.py +++ b/tests/models/markuplm/test_modeling_markuplm.py @@ -14,10 +14,10 @@ import unittest +from functools import cached_property from transformers import MarkupLMConfig, is_torch_available from transformers.testing_utils import require_torch, slow, torch_device -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, ids_tensor diff --git a/tests/models/markuplm/test_processing_markuplm.py b/tests/models/markuplm/test_processing_markuplm.py index fa2e913d9952..59f7f365d693 100644 --- a/tests/models/markuplm/test_processing_markuplm.py +++ b/tests/models/markuplm/test_processing_markuplm.py @@ -17,6 +17,7 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import ( MarkupLMProcessor, @@ -27,7 +28,7 @@ ) from transformers.models.markuplm.tokenization_markuplm import VOCAB_FILES_NAMES from transformers.testing_utils import require_bs4, require_tokenizers, require_torch, slow -from transformers.utils import FEATURE_EXTRACTOR_NAME, cached_property, is_bs4_available, is_tokenizers_available +from transformers.utils import FEATURE_EXTRACTOR_NAME, is_bs4_available, is_tokenizers_available if is_bs4_available(): diff --git a/tests/models/mask2former/test_modeling_mask2former.py b/tests/models/mask2former/test_modeling_mask2former.py index de0efc0410d9..07a0744dd249 100644 --- a/tests/models/mask2former/test_modeling_mask2former.py +++ b/tests/models/mask2former/test_modeling_mask2former.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch Mask2Former model.""" import unittest +from functools import cached_property import numpy as np import pytest @@ -32,7 +33,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init diff --git a/tests/models/maskformer/test_modeling_maskformer.py b/tests/models/maskformer/test_modeling_maskformer.py index af5fcb4ca13b..0501df3b9409 100644 --- a/tests/models/maskformer/test_modeling_maskformer.py +++ b/tests/models/maskformer/test_modeling_maskformer.py @@ -15,6 +15,7 @@ import copy import unittest +from functools import cached_property import numpy as np @@ -31,7 +32,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin diff --git a/tests/models/mbart/test_modeling_mbart.py b/tests/models/mbart/test_modeling_mbart.py index 0a69d0ad062f..8ce92f33efb2 100644 --- a/tests/models/mbart/test_modeling_mbart.py +++ b/tests/models/mbart/test_modeling_mbart.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property from transformers import MBartConfig, is_torch_available from transformers.testing_utils import ( @@ -26,7 +27,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/mm_grounding_dino/test_modeling_mm_grounding_dino.py b/tests/models/mm_grounding_dino/test_modeling_mm_grounding_dino.py index 1d380bc3e097..b4c69e0065cd 100644 --- a/tests/models/mm_grounding_dino/test_modeling_mm_grounding_dino.py +++ b/tests/models/mm_grounding_dino/test_modeling_mm_grounding_dino.py @@ -18,6 +18,7 @@ import math import re import unittest +from functools import cached_property from datasets import load_dataset @@ -27,7 +28,6 @@ is_torch_available, is_vision_available, ) -from transformers.file_utils import cached_property from transformers.testing_utils import ( is_flaky, require_timm, diff --git a/tests/models/mobilenet_v1/test_modeling_mobilenet_v1.py b/tests/models/mobilenet_v1/test_modeling_mobilenet_v1.py index dcd7290341c2..41a0bdb7e5d1 100644 --- a/tests/models/mobilenet_v1/test_modeling_mobilenet_v1.py +++ b/tests/models/mobilenet_v1/test_modeling_mobilenet_v1.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch MobileNetV1 model.""" import unittest +from functools import cached_property from transformers import MobileNetV1Config from transformers.testing_utils import Expectations, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/mobilenet_v2/test_modeling_mobilenet_v2.py b/tests/models/mobilenet_v2/test_modeling_mobilenet_v2.py index e2cda4b74b3f..2abcf6aa8f87 100644 --- a/tests/models/mobilenet_v2/test_modeling_mobilenet_v2.py +++ b/tests/models/mobilenet_v2/test_modeling_mobilenet_v2.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch MobileNetV2 model.""" import unittest +from functools import cached_property from transformers import MobileNetV2Config from transformers.testing_utils import Expectations, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/mobilevit/test_modeling_mobilevit.py b/tests/models/mobilevit/test_modeling_mobilevit.py index 9dc4b98bcb91..92a2ad87f01c 100644 --- a/tests/models/mobilevit/test_modeling_mobilevit.py +++ b/tests/models/mobilevit/test_modeling_mobilevit.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch MobileViT model.""" import unittest +from functools import cached_property from transformers import MobileViTConfig from transformers.testing_utils import Expectations, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/mobilevitv2/test_modeling_mobilevitv2.py b/tests/models/mobilevitv2/test_modeling_mobilevitv2.py index a745b77d4e11..c6ae351c4858 100644 --- a/tests/models/mobilevitv2/test_modeling_mobilevitv2.py +++ b/tests/models/mobilevitv2/test_modeling_mobilevitv2.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch MobileViTV2 model.""" import unittest +from functools import cached_property from transformers import MobileViTV2Config from transformers.testing_utils import ( @@ -24,7 +25,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/moshi/test_modeling_moshi.py b/tests/models/moshi/test_modeling_moshi.py index b6a848503117..6df9393f8041 100644 --- a/tests/models/moshi/test_modeling_moshi.py +++ b/tests/models/moshi/test_modeling_moshi.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property import numpy as np import pytest @@ -38,7 +39,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/musicgen/test_modeling_musicgen.py b/tests/models/musicgen/test_modeling_musicgen.py index 33c5dc191c8b..b05eb1a91236 100644 --- a/tests/models/musicgen/test_modeling_musicgen.py +++ b/tests/models/musicgen/test_modeling_musicgen.py @@ -18,6 +18,7 @@ import math import tempfile import unittest +from functools import cached_property import numpy as np import pytest @@ -43,7 +44,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/musicgen_melody/test_modeling_musicgen_melody.py b/tests/models/musicgen_melody/test_modeling_musicgen_melody.py index 8152db392ff4..f8e1a0969e92 100644 --- a/tests/models/musicgen_melody/test_modeling_musicgen_melody.py +++ b/tests/models/musicgen_melody/test_modeling_musicgen_melody.py @@ -18,6 +18,7 @@ import math import tempfile import unittest +from functools import cached_property import numpy as np import pytest @@ -45,7 +46,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/mvp/test_modeling_mvp.py b/tests/models/mvp/test_modeling_mvp.py index 1dc16992633c..f44f9ef87256 100644 --- a/tests/models/mvp/test_modeling_mvp.py +++ b/tests/models/mvp/test_modeling_mvp.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property import timeout_decorator # noqa @@ -28,7 +29,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/mvp/test_tokenization_mvp.py b/tests/models/mvp/test_tokenization_mvp.py index 62906138f3c9..c304ab166078 100644 --- a/tests/models/mvp/test_tokenization_mvp.py +++ b/tests/models/mvp/test_tokenization_mvp.py @@ -14,11 +14,11 @@ import json import os import unittest +from functools import cached_property from transformers import BatchEncoding, MvpTokenizer, MvpTokenizerFast from transformers.models.roberta.tokenization_roberta import VOCAB_FILES_NAMES from transformers.testing_utils import require_tokenizers, require_torch -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin, filter_roberta_detectors diff --git a/tests/models/nllb_moe/test_modeling_nllb_moe.py b/tests/models/nllb_moe/test_modeling_nllb_moe.py index 2eb3f2fbfc70..37fdd51e8478 100644 --- a/tests/models/nllb_moe/test_modeling_nllb_moe.py +++ b/tests/models/nllb_moe/test_modeling_nllb_moe.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property from transformers import NllbMoeConfig, is_torch_available, set_seed from transformers.testing_utils import ( @@ -26,7 +27,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/nougat/test_image_processing_nougat.py b/tests/models/nougat/test_image_processing_nougat.py index 1a174ebc0f48..8dc4b9816cba 100644 --- a/tests/models/nougat/test_image_processing_nougat.py +++ b/tests/models/nougat/test_image_processing_nougat.py @@ -14,13 +14,14 @@ import unittest +from functools import cached_property import numpy as np from huggingface_hub import hf_hub_download from transformers.image_utils import SizeDict, load_image from transformers.testing_utils import require_torch, require_vision -from transformers.utils import cached_property, is_torch_available, is_torchvision_available, is_vision_available +from transformers.utils import is_torch_available, is_torchvision_available, is_vision_available from ...test_image_processing_common import ImageProcessingTestMixin, prepare_image_inputs from ...test_processing_common import url_to_local_path diff --git a/tests/models/omdet_turbo/test_modeling_omdet_turbo.py b/tests/models/omdet_turbo/test_modeling_omdet_turbo.py index b7119d79730c..224ebd1c6cee 100644 --- a/tests/models/omdet_turbo/test_modeling_omdet_turbo.py +++ b/tests/models/omdet_turbo/test_modeling_omdet_turbo.py @@ -15,13 +15,13 @@ import copy import unittest +from functools import cached_property from io import BytesIO import requests from transformers import OmDetTurboConfig, is_torch_available, is_vision_available from transformers.feature_extraction_utils import BatchFeature -from transformers.file_utils import cached_property from transformers.testing_utils import ( require_timm, require_torch, diff --git a/tests/models/oneformer/test_modeling_oneformer.py b/tests/models/oneformer/test_modeling_oneformer.py index 669369344f36..5269b1d155cf 100644 --- a/tests/models/oneformer/test_modeling_oneformer.py +++ b/tests/models/oneformer/test_modeling_oneformer.py @@ -15,6 +15,7 @@ import inspect import unittest +from functools import cached_property import numpy as np @@ -32,7 +33,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init diff --git a/tests/models/pegasus/test_modeling_pegasus.py b/tests/models/pegasus/test_modeling_pegasus.py index e1dd7676b348..a8aa93adedbb 100644 --- a/tests/models/pegasus/test_modeling_pegasus.py +++ b/tests/models/pegasus/test_modeling_pegasus.py @@ -15,6 +15,7 @@ import tempfile import unittest +from functools import cached_property from transformers import PegasusConfig, is_torch_available from transformers.testing_utils import ( @@ -25,7 +26,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/pegasus/test_tokenization_pegasus.py b/tests/models/pegasus/test_tokenization_pegasus.py index 1a505b6f6e23..bd8d07cdabae 100644 --- a/tests/models/pegasus/test_tokenization_pegasus.py +++ b/tests/models/pegasus/test_tokenization_pegasus.py @@ -13,10 +13,10 @@ # limitations under the License. import unittest +from functools import cached_property from transformers import PegasusTokenizer, PegasusTokenizerFast from transformers.testing_utils import get_tests_dir, require_sentencepiece, require_tokenizers, require_torch, slow -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/pegasus_x/test_modeling_pegasus_x.py b/tests/models/pegasus_x/test_modeling_pegasus_x.py index 20cdac98fbed..241fe66f25e3 100644 --- a/tests/models/pegasus_x/test_modeling_pegasus_x.py +++ b/tests/models/pegasus_x/test_modeling_pegasus_x.py @@ -17,6 +17,7 @@ import math import tempfile import unittest +from functools import cached_property from transformers import is_torch_available from transformers.testing_utils import ( @@ -27,7 +28,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/perceiver/test_tokenization_perceiver.py b/tests/models/perceiver/test_tokenization_perceiver.py index ed6a3d30396a..87d9f3d0075c 100644 --- a/tests/models/perceiver/test_tokenization_perceiver.py +++ b/tests/models/perceiver/test_tokenization_perceiver.py @@ -18,9 +18,10 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import AddedToken, BatchEncoding, PerceiverTokenizer -from transformers.utils import cached_property, is_tf_available, is_torch_available +from transformers.utils import is_tf_available, is_torch_available from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/plbart/test_modeling_plbart.py b/tests/models/plbart/test_modeling_plbart.py index 8bc551c2cb72..75f72a19028f 100644 --- a/tests/models/plbart/test_modeling_plbart.py +++ b/tests/models/plbart/test_modeling_plbart.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property from transformers import PLBartConfig, is_torch_available from transformers.testing_utils import ( @@ -26,7 +27,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/rag/test_modeling_rag.py b/tests/models/rag/test_modeling_rag.py index 4163cf793d55..ad0160a42a69 100644 --- a/tests/models/rag/test_modeling_rag.py +++ b/tests/models/rag/test_modeling_rag.py @@ -18,6 +18,7 @@ import shutil import tempfile import unittest +from functools import cached_property from unittest.mock import patch import numpy as np @@ -37,7 +38,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_datasets_available, is_faiss_available, is_torch_available +from transformers.utils import is_datasets_available, is_faiss_available, is_torch_available from ..bart.test_modeling_bart import BartModelTester from ..dpr.test_modeling_dpr import DPRModelTester diff --git a/tests/models/reformer/test_tokenization_reformer.py b/tests/models/reformer/test_tokenization_reformer.py index d5e3901b3fb7..297470a2e171 100644 --- a/tests/models/reformer/test_tokenization_reformer.py +++ b/tests/models/reformer/test_tokenization_reformer.py @@ -13,10 +13,10 @@ # limitations under the License. import unittest +from functools import cached_property from transformers import SPIECE_UNDERLINE, ReformerTokenizer, ReformerTokenizerFast from transformers.testing_utils import get_tests_dir, require_sentencepiece, require_tokenizers, require_torch, slow -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/regnet/test_modeling_regnet.py b/tests/models/regnet/test_modeling_regnet.py index e51e4fec6d7c..bc7be198d145 100644 --- a/tests/models/regnet/test_modeling_regnet.py +++ b/tests/models/regnet/test_modeling_regnet.py @@ -14,9 +14,10 @@ """Testing suite for the PyTorch RegNet model.""" import unittest +from functools import cached_property from transformers import RegNetConfig -from transformers.file_utils import cached_property, is_torch_available, is_vision_available +from transformers.file_utils import is_torch_available, is_vision_available from transformers.testing_utils import Expectations, is_flaky, require_torch, require_vision, slow, torch_device from ...test_configuration_common import ConfigTester diff --git a/tests/models/resnet/test_modeling_resnet.py b/tests/models/resnet/test_modeling_resnet.py index ea1acf7d0c9b..42c5aba10446 100644 --- a/tests/models/resnet/test_modeling_resnet.py +++ b/tests/models/resnet/test_modeling_resnet.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch ResNet model.""" import unittest +from functools import cached_property from transformers import ResNetConfig from transformers.testing_utils import Expectations, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/rt_detr/test_modeling_rt_detr.py b/tests/models/rt_detr/test_modeling_rt_detr.py index 735d74cb704f..746d98c138f9 100644 --- a/tests/models/rt_detr/test_modeling_rt_detr.py +++ b/tests/models/rt_detr/test_modeling_rt_detr.py @@ -18,6 +18,7 @@ import math import tempfile import unittest +from functools import cached_property from parameterized import parameterized @@ -36,7 +37,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor diff --git a/tests/models/rt_detr_v2/test_modeling_rt_detr_v2.py b/tests/models/rt_detr_v2/test_modeling_rt_detr_v2.py index f6b06497ace5..de7414ba6536 100644 --- a/tests/models/rt_detr_v2/test_modeling_rt_detr_v2.py +++ b/tests/models/rt_detr_v2/test_modeling_rt_detr_v2.py @@ -18,6 +18,7 @@ import math import tempfile import unittest +from functools import cached_property from parameterized import parameterized @@ -35,7 +36,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor diff --git a/tests/models/seamless_m4t/test_modeling_seamless_m4t.py b/tests/models/seamless_m4t/test_modeling_seamless_m4t.py index 505237239376..6e5bb8e7f2b4 100644 --- a/tests/models/seamless_m4t/test_modeling_seamless_m4t.py +++ b/tests/models/seamless_m4t/test_modeling_seamless_m4t.py @@ -16,11 +16,11 @@ import copy import tempfile import unittest +from functools import cached_property from transformers import SeamlessM4TConfig, is_speech_available, is_torch_available from transformers.testing_utils import require_speech, require_torch, slow, torch_device from transformers.trainer_utils import set_seed -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ( diff --git a/tests/models/seamless_m4t_v2/test_modeling_seamless_m4t_v2.py b/tests/models/seamless_m4t_v2/test_modeling_seamless_m4t_v2.py index cedbfe42330d..1cadf22ca9d9 100644 --- a/tests/models/seamless_m4t_v2/test_modeling_seamless_m4t_v2.py +++ b/tests/models/seamless_m4t_v2/test_modeling_seamless_m4t_v2.py @@ -16,11 +16,11 @@ import copy import tempfile import unittest +from functools import cached_property from transformers import SeamlessM4Tv2Config, is_speech_available, is_torch_available from transformers.testing_utils import require_speech, require_torch, slow, torch_device from transformers.trainer_utils import set_seed -from transformers.utils import cached_property from ...test_configuration_common import ConfigTester from ...test_modeling_common import ( diff --git a/tests/models/seggpt/test_modeling_seggpt.py b/tests/models/seggpt/test_modeling_seggpt.py index 4083276e1852..4a30b5cbd8bb 100644 --- a/tests/models/seggpt/test_modeling_seggpt.py +++ b/tests/models/seggpt/test_modeling_seggpt.py @@ -16,6 +16,7 @@ import inspect import math import unittest +from functools import cached_property from datasets import load_dataset @@ -27,7 +28,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor diff --git a/tests/models/siglip/test_tokenization_siglip.py b/tests/models/siglip/test_tokenization_siglip.py index ab682bd9ed64..68e7f1fbf4b1 100644 --- a/tests/models/siglip/test_tokenization_siglip.py +++ b/tests/models/siglip/test_tokenization_siglip.py @@ -16,10 +16,11 @@ import os import tempfile import unittest +from functools import cached_property from transformers import SPIECE_UNDERLINE, AddedToken, BatchEncoding, SiglipTokenizer 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 transformers.utils import is_tf_available, is_torch_available from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/speecht5/test_modeling_speecht5.py b/tests/models/speecht5/test_modeling_speecht5.py index 642759b00dcc..08901367fd44 100644 --- a/tests/models/speecht5/test_modeling_speecht5.py +++ b/tests/models/speecht5/test_modeling_speecht5.py @@ -17,6 +17,7 @@ import inspect import tempfile import unittest +from functools import cached_property from transformers import SpeechT5Config, SpeechT5HifiGanConfig from transformers.testing_utils import ( @@ -30,7 +31,6 @@ torch_device, ) from transformers.trainer_utils import set_seed -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/superglue/test_modeling_superglue.py b/tests/models/superglue/test_modeling_superglue.py index daafbef62b3a..cc916c55b826 100644 --- a/tests/models/superglue/test_modeling_superglue.py +++ b/tests/models/superglue/test_modeling_superglue.py @@ -13,12 +13,13 @@ # limitations under the License. import inspect import unittest +from functools import cached_property from datasets import load_dataset from transformers.models.superglue.configuration_superglue import SuperGlueConfig 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 transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor diff --git a/tests/models/superpoint/test_modeling_superpoint.py b/tests/models/superpoint/test_modeling_superpoint.py index 329148e67e66..0f49a8f00bcc 100644 --- a/tests/models/superpoint/test_modeling_superpoint.py +++ b/tests/models/superpoint/test_modeling_superpoint.py @@ -13,10 +13,11 @@ # limitations under the License. import inspect import unittest +from functools import cached_property from transformers.models.superpoint.configuration_superpoint import SuperPointConfig from transformers.testing_utils import is_flaky, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor diff --git a/tests/models/swiftformer/test_modeling_swiftformer.py b/tests/models/swiftformer/test_modeling_swiftformer.py index 5b5736f83d76..e17114793b49 100644 --- a/tests/models/swiftformer/test_modeling_swiftformer.py +++ b/tests/models/swiftformer/test_modeling_swiftformer.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch SwiftFormer model.""" import unittest +from functools import cached_property from transformers import SwiftFormerConfig from transformers.testing_utils import ( @@ -22,7 +23,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor, ids_tensor diff --git a/tests/models/swin/test_modeling_swin.py b/tests/models/swin/test_modeling_swin.py index a7cdb6a8de3b..17dac09168b1 100644 --- a/tests/models/swin/test_modeling_swin.py +++ b/tests/models/swin/test_modeling_swin.py @@ -15,10 +15,11 @@ import collections import unittest +from functools import cached_property from transformers import SwinConfig 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 transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/swinv2/test_modeling_swinv2.py b/tests/models/swinv2/test_modeling_swinv2.py index 42138d6c7c51..0779236859e7 100644 --- a/tests/models/swinv2/test_modeling_swinv2.py +++ b/tests/models/swinv2/test_modeling_swinv2.py @@ -16,10 +16,11 @@ import collections import inspect import unittest +from functools import cached_property from transformers import Swinv2Config 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 transformers.utils import is_torch_available, is_vision_available from ...test_backbone_common import BackboneTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/t5/test_modeling_t5.py b/tests/models/t5/test_modeling_t5.py index 9de1467fa061..299c5b232264 100644 --- a/tests/models/t5/test_modeling_t5.py +++ b/tests/models/t5/test_modeling_t5.py @@ -18,6 +18,7 @@ import pickle import tempfile import unittest +from functools import cached_property import pytest @@ -35,7 +36,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from transformers.utils.fx import symbolic_trace from ...generation.test_utils import GenerationTesterMixin diff --git a/tests/models/t5/test_tokenization_t5.py b/tests/models/t5/test_tokenization_t5.py index 31a5503ef1d2..cfc689eaf1c0 100644 --- a/tests/models/t5/test_tokenization_t5.py +++ b/tests/models/t5/test_tokenization_t5.py @@ -16,10 +16,11 @@ import re import tempfile import unittest +from functools import cached_property from transformers import SPIECE_UNDERLINE, AddedToken, BatchEncoding, T5Tokenizer, T5TokenizerFast from transformers.testing_utils import get_tests_dir, require_sentencepiece, require_seqio, require_tokenizers, slow -from transformers.utils import cached_property, is_tf_available, is_torch_available +from transformers.utils import is_tf_available, is_torch_available from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/tapas/test_modeling_tapas.py b/tests/models/tapas/test_modeling_tapas.py index a21981ce4953..c96c7691687c 100644 --- a/tests/models/tapas/test_modeling_tapas.py +++ b/tests/models/tapas/test_modeling_tapas.py @@ -14,6 +14,7 @@ import copy import unittest +from functools import cached_property import numpy as np import pandas as pd @@ -32,7 +33,6 @@ ) from transformers.models.auto import get_values from transformers.testing_utils import 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 diff --git a/tests/models/timesformer/test_modeling_timesformer.py b/tests/models/timesformer/test_modeling_timesformer.py index 81177ae5cedc..10aef612fdae 100644 --- a/tests/models/timesformer/test_modeling_timesformer.py +++ b/tests/models/timesformer/test_modeling_timesformer.py @@ -15,6 +15,7 @@ import copy import unittest +from functools import cached_property import numpy as np from huggingface_hub import hf_hub_download @@ -22,7 +23,7 @@ from transformers import TimesformerConfig from transformers.models.auto import get_values from transformers.testing_utils import Expectations, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/tvp/test_modeling_tvp.py b/tests/models/tvp/test_modeling_tvp.py index 5c4e3d7de482..c002127cbd9a 100644 --- a/tests/models/tvp/test_modeling_tvp.py +++ b/tests/models/tvp/test_modeling_tvp.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch TVP model.""" import unittest +from functools import cached_property from transformers import ResNetConfig, TimmBackboneConfig, TvpConfig from transformers.testing_utils import require_timm, require_torch, require_vision, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_modeling_common import ( ModelTesterMixin, diff --git a/tests/models/udop/test_modeling_udop.py b/tests/models/udop/test_modeling_udop.py index 92dd47c39201..3ec5df33d2b9 100644 --- a/tests/models/udop/test_modeling_udop.py +++ b/tests/models/udop/test_modeling_udop.py @@ -15,6 +15,7 @@ import copy import inspect import unittest +from functools import cached_property from datasets import load_dataset @@ -27,7 +28,6 @@ slow, torch_device, ) -from transformers.utils import cached_property from ...generation.test_utils import GenerationTesterMixin from ...test_configuration_common import ConfigTester diff --git a/tests/models/udop/test_processing_udop.py b/tests/models/udop/test_processing_udop.py index 78cb2c36b9f3..775ab5404310 100644 --- a/tests/models/udop/test_processing_udop.py +++ b/tests/models/udop/test_processing_udop.py @@ -15,6 +15,7 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import ( PreTrainedTokenizer, @@ -31,7 +32,7 @@ require_torch, slow, ) -from transformers.utils import cached_property, is_pytesseract_available, is_torch_available +from transformers.utils import is_pytesseract_available, is_torch_available from ...test_processing_common import ProcessorTesterMixin diff --git a/tests/models/videomae/test_modeling_videomae.py b/tests/models/videomae/test_modeling_videomae.py index 224d9fe1d723..af5b96acad63 100644 --- a/tests/models/videomae/test_modeling_videomae.py +++ b/tests/models/videomae/test_modeling_videomae.py @@ -16,6 +16,7 @@ import copy import tempfile import unittest +from functools import cached_property import numpy as np from huggingface_hub import hf_hub_download @@ -33,7 +34,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, check_torch_load_is_safe, is_torch_available, is_vision_available +from transformers.utils import check_torch_load_is_safe, is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/vilt/test_modeling_vilt.py b/tests/models/vilt/test_modeling_vilt.py index ec3fff698bef..faffcfccabed 100644 --- a/tests/models/vilt/test_modeling_vilt.py +++ b/tests/models/vilt/test_modeling_vilt.py @@ -14,13 +14,13 @@ """Testing suite for the PyTorch ViLT model.""" import unittest +from functools import cached_property from datasets import load_dataset from packaging import version from transformers import ViltConfig, is_torch_available, is_vision_available from transformers.testing_utils import require_torch, require_vision, 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 diff --git a/tests/models/vision_encoder_decoder/test_modeling_vision_encoder_decoder.py b/tests/models/vision_encoder_decoder/test_modeling_vision_encoder_decoder.py index dbaa2d3d8db1..2401a1e5fb15 100644 --- a/tests/models/vision_encoder_decoder/test_modeling_vision_encoder_decoder.py +++ b/tests/models/vision_encoder_decoder/test_modeling_vision_encoder_decoder.py @@ -15,6 +15,7 @@ import re import tempfile import unittest +from functools import cached_property from datasets import load_dataset from huggingface_hub import hf_hub_download @@ -32,7 +33,6 @@ torch_device, ) from transformers.utils import ( - cached_property, is_torch_available, is_vision_available, ) diff --git a/tests/models/vit/test_modeling_vit.py b/tests/models/vit/test_modeling_vit.py index 6d8337a893fc..9094e6898804 100644 --- a/tests/models/vit/test_modeling_vit.py +++ b/tests/models/vit/test_modeling_vit.py @@ -14,6 +14,7 @@ """Testing suite for the PyTorch ViT model.""" import unittest +from functools import cached_property from transformers import ViTConfig from transformers.testing_utils import ( @@ -25,7 +26,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/vit_mae/test_modeling_vit_mae.py b/tests/models/vit_mae/test_modeling_vit_mae.py index 9c5710146d37..a79bcec8af72 100644 --- a/tests/models/vit_mae/test_modeling_vit_mae.py +++ b/tests/models/vit_mae/test_modeling_vit_mae.py @@ -16,6 +16,7 @@ import math import tempfile import unittest +from functools import cached_property import numpy as np from pytest import mark @@ -30,7 +31,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, _config_zero_init, floats_tensor, ids_tensor diff --git a/tests/models/vit_msn/test_modeling_vit_msn.py b/tests/models/vit_msn/test_modeling_vit_msn.py index 4fd320989755..8bd6850f1bb1 100644 --- a/tests/models/vit_msn/test_modeling_vit_msn.py +++ b/tests/models/vit_msn/test_modeling_vit_msn.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch ViTMSN model.""" import unittest +from functools import cached_property from transformers import ViTMSNConfig 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 transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/vitpose/test_modeling_vitpose.py b/tests/models/vitpose/test_modeling_vitpose.py index d7782915cffa..7cb92e10f005 100644 --- a/tests/models/vitpose/test_modeling_vitpose.py +++ b/tests/models/vitpose/test_modeling_vitpose.py @@ -15,12 +15,13 @@ import inspect import unittest +from functools import cached_property import requests from transformers import VitPoseBackboneConfig, VitPoseConfig 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 transformers.utils import is_torch_available, is_vision_available from transformers.utils.import_utils import get_torch_major_and_minor_version from ...test_configuration_common import ConfigTester diff --git a/tests/models/vivit/test_modeling_vivit.py b/tests/models/vivit/test_modeling_vivit.py index 44c4f03781e6..f1bd8da01e9b 100644 --- a/tests/models/vivit/test_modeling_vivit.py +++ b/tests/models/vivit/test_modeling_vivit.py @@ -16,6 +16,7 @@ import copy import inspect import unittest +from functools import cached_property import numpy as np from huggingface_hub import hf_hub_download @@ -23,7 +24,7 @@ from transformers import VivitConfig from transformers.models.auto import get_values from transformers.testing_utils import Expectations, require_torch, require_vision, slow, torch_device -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor, ids_tensor diff --git a/tests/models/vjepa2/test_modeling_vjepa2.py b/tests/models/vjepa2/test_modeling_vjepa2.py index 1227ce50eccd..1d0004122ab4 100644 --- a/tests/models/vjepa2/test_modeling_vjepa2.py +++ b/tests/models/vjepa2/test_modeling_vjepa2.py @@ -15,6 +15,7 @@ """Testing suite for the PyTorch V-JEPA2 model.""" import unittest +from functools import cached_property import numpy as np @@ -26,7 +27,7 @@ slow, torch_device, ) -from transformers.utils import cached_property, is_torch_available, is_vision_available +from transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor diff --git a/tests/models/xglm/test_tokenization_xglm.py b/tests/models/xglm/test_tokenization_xglm.py index 3444a58b32fe..c45f1747f78f 100644 --- a/tests/models/xglm/test_tokenization_xglm.py +++ b/tests/models/xglm/test_tokenization_xglm.py @@ -16,10 +16,10 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import SPIECE_UNDERLINE, XGLMTokenizer, XGLMTokenizerFast from transformers.testing_utils import get_tests_dir, require_sentencepiece, require_tokenizers, slow -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/xlm_roberta/test_tokenization_xlm_roberta.py b/tests/models/xlm_roberta/test_tokenization_xlm_roberta.py index 41f37f846863..3fe66d53a263 100644 --- a/tests/models/xlm_roberta/test_tokenization_xlm_roberta.py +++ b/tests/models/xlm_roberta/test_tokenization_xlm_roberta.py @@ -16,10 +16,10 @@ import shutil import tempfile import unittest +from functools import cached_property from transformers import SPIECE_UNDERLINE, XLMRobertaTokenizer, XLMRobertaTokenizerFast from transformers.testing_utils import get_tests_dir, require_sentencepiece, require_tokenizers, slow -from transformers.utils import cached_property from ...test_tokenization_common import TokenizerTesterMixin diff --git a/tests/models/yolos/test_modeling_yolos.py b/tests/models/yolos/test_modeling_yolos.py index 3c2a78a87200..e4de540ef3e8 100644 --- a/tests/models/yolos/test_modeling_yolos.py +++ b/tests/models/yolos/test_modeling_yolos.py @@ -14,10 +14,11 @@ """Testing suite for the PyTorch YOLOS model.""" import unittest +from functools import cached_property from transformers import YolosConfig 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 transformers.utils import is_torch_available, is_vision_available from ...test_configuration_common import ConfigTester from ...test_modeling_common import ModelTesterMixin, floats_tensor