From 45a3fc75661d183ed99fbaf684b5930dbb076cf2 Mon Sep 17 00:00:00 2001 From: yonigozlan Date: Thu, 21 Nov 2024 15:08:58 +0000 Subject: [PATCH 1/2] Fix import structure image_processor_fast --- src/transformers/__init__.py | 22 ++++++++++--------- .../models/deformable_detr/__init__.py | 22 ++++++++++++++++++- src/transformers/models/detr/__init__.py | 22 ++++++++++++++++++- src/transformers/models/rt_detr/__init__.py | 22 ++++++++++++++++++- .../utils/dummy_torchvision_objects.py | 21 ++++++++++++++++++ .../utils/dummy_vision_objects.py | 21 ------------------ 6 files changed, 96 insertions(+), 34 deletions(-) diff --git a/src/transformers/__init__.py b/src/transformers/__init__.py index ce2a2553d6d7..fa54ced6a134 100755 --- a/src/transformers/__init__.py +++ b/src/transformers/__init__.py @@ -1186,14 +1186,14 @@ ) _import_structure["models.convnext"].extend(["ConvNextFeatureExtractor", "ConvNextImageProcessor"]) _import_structure["models.deformable_detr"].extend( - ["DeformableDetrFeatureExtractor", "DeformableDetrImageProcessor", "DeformableDetrImageProcessorFast"] + ["DeformableDetrFeatureExtractor", "DeformableDetrImageProcessor"] ) _import_structure["models.deit"].extend(["DeiTFeatureExtractor", "DeiTImageProcessor"]) _import_structure["models.deprecated.deta"].append("DetaImageProcessor") _import_structure["models.deprecated.efficientformer"].append("EfficientFormerImageProcessor") _import_structure["models.deprecated.tvlt"].append("TvltImageProcessor") _import_structure["models.deprecated.vit_hybrid"].extend(["ViTHybridImageProcessor"]) - _import_structure["models.detr"].extend(["DetrFeatureExtractor", "DetrImageProcessor", "DetrImageProcessorFast"]) + _import_structure["models.detr"].extend(["DetrFeatureExtractor", "DetrImageProcessor"]) _import_structure["models.donut"].extend(["DonutFeatureExtractor", "DonutImageProcessor"]) _import_structure["models.dpt"].extend(["DPTFeatureExtractor", "DPTImageProcessor"]) _import_structure["models.efficientnet"].append("EfficientNetImageProcessor") @@ -1230,7 +1230,7 @@ _import_structure["models.poolformer"].extend(["PoolFormerFeatureExtractor", "PoolFormerImageProcessor"]) _import_structure["models.pvt"].extend(["PvtImageProcessor"]) _import_structure["models.qwen2_vl"].extend(["Qwen2VLImageProcessor"]) - _import_structure["models.rt_detr"].extend(["RTDetrImageProcessor", "RTDetrImageProcessorFast"]) + _import_structure["models.rt_detr"].extend(["RTDetrImageProcessor"]) _import_structure["models.sam"].extend(["SamImageProcessor"]) _import_structure["models.segformer"].extend(["SegformerFeatureExtractor", "SegformerImageProcessor"]) _import_structure["models.seggpt"].extend(["SegGptImageProcessor"]) @@ -1258,6 +1258,9 @@ ] else: _import_structure["image_processing_utils_fast"] = ["BaseImageProcessorFast"] + _import_structure["models.deformable_detr"].append("DeformableDetrImageProcessorFast") + _import_structure["models.detr"].append("DetrImageProcessorFast") + _import_structure["models.rt_detr"].append("RTDetrImageProcessorFast") _import_structure["models.vit"].append("ViTImageProcessorFast") # PyTorch-backed objects @@ -6097,17 +6100,13 @@ ConditionalDetrImageProcessor, ) from .models.convnext import ConvNextFeatureExtractor, ConvNextImageProcessor - from .models.deformable_detr import ( - DeformableDetrFeatureExtractor, - DeformableDetrImageProcessor, - DeformableDetrImageProcessorFast, - ) + from .models.deformable_detr import DeformableDetrFeatureExtractor, DeformableDetrImageProcessor from .models.deit import DeiTFeatureExtractor, DeiTImageProcessor from .models.deprecated.deta import DetaImageProcessor from .models.deprecated.efficientformer import EfficientFormerImageProcessor from .models.deprecated.tvlt import TvltImageProcessor from .models.deprecated.vit_hybrid import ViTHybridImageProcessor - from .models.detr import DetrFeatureExtractor, DetrImageProcessor, DetrImageProcessorFast + from .models.detr import DetrFeatureExtractor, DetrImageProcessor from .models.donut import DonutFeatureExtractor, DonutImageProcessor from .models.dpt import DPTFeatureExtractor, DPTImageProcessor from .models.efficientnet import EfficientNetImageProcessor @@ -6164,7 +6163,7 @@ ) from .models.pvt import PvtImageProcessor from .models.qwen2_vl import Qwen2VLImageProcessor - from .models.rt_detr import RTDetrImageProcessor, RTDetrImageProcessorFast + from .models.rt_detr import RTDetrImageProcessor from .models.sam import SamImageProcessor from .models.segformer import SegformerFeatureExtractor, SegformerImageProcessor from .models.seggpt import SegGptImageProcessor @@ -6188,6 +6187,9 @@ from .utils.dummy_torchvision_objects import * else: from .image_processing_utils_fast import BaseImageProcessorFast + from .models.deformable_detr import DeformableDetrImageProcessorFast + from .models.detr import DetrImageProcessorFast + from .models.rt_detr import RTDetrImageProcessorFast from .models.vit import ViTImageProcessorFast # Modeling diff --git a/src/transformers/models/deformable_detr/__init__.py b/src/transformers/models/deformable_detr/__init__.py index 7c756c4bdffd..64ade815c418 100644 --- a/src/transformers/models/deformable_detr/__init__.py +++ b/src/transformers/models/deformable_detr/__init__.py @@ -14,7 +14,13 @@ from typing import TYPE_CHECKING -from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available +from ...utils import ( + OptionalDependencyNotAvailable, + _LazyModule, + is_torch_available, + is_torchvision_available, + is_vision_available, +) _import_structure = { @@ -29,6 +35,13 @@ else: _import_structure["feature_extraction_deformable_detr"] = ["DeformableDetrFeatureExtractor"] _import_structure["image_processing_deformable_detr"] = ["DeformableDetrImageProcessor"] + +try: + if not is_torchvision_available(): + raise OptionalDependencyNotAvailable() +except OptionalDependencyNotAvailable: + pass +else: _import_structure["image_processing_deformable_detr_fast"] = ["DeformableDetrImageProcessorFast"] try: @@ -55,6 +68,13 @@ else: from .feature_extraction_deformable_detr import DeformableDetrFeatureExtractor from .image_processing_deformable_detr import DeformableDetrImageProcessor + + try: + if not is_torchvision_available(): + raise OptionalDependencyNotAvailable() + except OptionalDependencyNotAvailable: + pass + else: from .image_processing_deformable_detr_fast import DeformableDetrImageProcessorFast try: diff --git a/src/transformers/models/detr/__init__.py b/src/transformers/models/detr/__init__.py index cc6687ff8bb4..a3ee0b4e4743 100644 --- a/src/transformers/models/detr/__init__.py +++ b/src/transformers/models/detr/__init__.py @@ -14,7 +14,13 @@ from typing import TYPE_CHECKING -from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available +from ...utils import ( + OptionalDependencyNotAvailable, + _LazyModule, + is_torch_available, + is_torchvision_available, + is_vision_available, +) _import_structure = {"configuration_detr": ["DetrConfig", "DetrOnnxConfig"]} @@ -27,6 +33,13 @@ else: _import_structure["feature_extraction_detr"] = ["DetrFeatureExtractor"] _import_structure["image_processing_detr"] = ["DetrImageProcessor"] + +try: + if not is_torchvision_available(): + raise OptionalDependencyNotAvailable() +except OptionalDependencyNotAvailable: + pass +else: _import_structure["image_processing_detr_fast"] = ["DetrImageProcessorFast"] try: @@ -54,6 +67,13 @@ else: from .feature_extraction_detr import DetrFeatureExtractor from .image_processing_detr import DetrImageProcessor + + try: + if not is_torchvision_available(): + raise OptionalDependencyNotAvailable() + except OptionalDependencyNotAvailable: + pass + else: from .image_processing_detr_fast import DetrImageProcessorFast try: diff --git a/src/transformers/models/rt_detr/__init__.py b/src/transformers/models/rt_detr/__init__.py index 52453f38b2c4..f7a6d56bbdb6 100644 --- a/src/transformers/models/rt_detr/__init__.py +++ b/src/transformers/models/rt_detr/__init__.py @@ -14,7 +14,13 @@ from typing import TYPE_CHECKING -from ...utils import OptionalDependencyNotAvailable, _LazyModule, is_torch_available, is_vision_available +from ...utils import ( + OptionalDependencyNotAvailable, + _LazyModule, + is_torch_available, + is_torchvision_available, + is_vision_available, +) _import_structure = {"configuration_rt_detr": ["RTDetrConfig"], "configuration_rt_detr_resnet": ["RTDetrResNetConfig"]} @@ -26,6 +32,13 @@ pass else: _import_structure["image_processing_rt_detr"] = ["RTDetrImageProcessor"] + +try: + if not is_torchvision_available(): + raise OptionalDependencyNotAvailable() +except OptionalDependencyNotAvailable: + pass +else: _import_structure["image_processing_rt_detr_fast"] = ["RTDetrImageProcessorFast"] try: @@ -56,6 +69,13 @@ pass else: from .image_processing_rt_detr import RTDetrImageProcessor + + try: + if not is_torchvision_available(): + raise OptionalDependencyNotAvailable() + except OptionalDependencyNotAvailable: + pass + else: from .image_processing_rt_detr_fast import RTDetrImageProcessorFast try: diff --git a/src/transformers/utils/dummy_torchvision_objects.py b/src/transformers/utils/dummy_torchvision_objects.py index 1d532aeea2a4..343eda601356 100644 --- a/src/transformers/utils/dummy_torchvision_objects.py +++ b/src/transformers/utils/dummy_torchvision_objects.py @@ -9,6 +9,27 @@ def __init__(self, *args, **kwargs): requires_backends(self, ["torchvision"]) +class DeformableDetrImageProcessorFast(metaclass=DummyObject): + _backends = ["torchvision"] + + def __init__(self, *args, **kwargs): + requires_backends(self, ["torchvision"]) + + +class DetrImageProcessorFast(metaclass=DummyObject): + _backends = ["torchvision"] + + def __init__(self, *args, **kwargs): + requires_backends(self, ["torchvision"]) + + +class RTDetrImageProcessorFast(metaclass=DummyObject): + _backends = ["torchvision"] + + def __init__(self, *args, **kwargs): + requires_backends(self, ["torchvision"]) + + class ViTImageProcessorFast(metaclass=DummyObject): _backends = ["torchvision"] diff --git a/src/transformers/utils/dummy_vision_objects.py b/src/transformers/utils/dummy_vision_objects.py index 189fbd25baf0..d2ccaeaaed23 100644 --- a/src/transformers/utils/dummy_vision_objects.py +++ b/src/transformers/utils/dummy_vision_objects.py @@ -135,13 +135,6 @@ def __init__(self, *args, **kwargs): requires_backends(self, ["vision"]) -class DeformableDetrImageProcessorFast(metaclass=DummyObject): - _backends = ["vision"] - - def __init__(self, *args, **kwargs): - requires_backends(self, ["vision"]) - - class DeiTFeatureExtractor(metaclass=DummyObject): _backends = ["vision"] @@ -198,13 +191,6 @@ def __init__(self, *args, **kwargs): requires_backends(self, ["vision"]) -class DetrImageProcessorFast(metaclass=DummyObject): - _backends = ["vision"] - - def __init__(self, *args, **kwargs): - requires_backends(self, ["vision"]) - - class DonutFeatureExtractor(metaclass=DummyObject): _backends = ["vision"] @@ -576,13 +562,6 @@ def __init__(self, *args, **kwargs): requires_backends(self, ["vision"]) -class RTDetrImageProcessorFast(metaclass=DummyObject): - _backends = ["vision"] - - def __init__(self, *args, **kwargs): - requires_backends(self, ["vision"]) - - class SamImageProcessor(metaclass=DummyObject): _backends = ["vision"] From f7915f57ae2a12bca27129444db4b10cc32b622c Mon Sep 17 00:00:00 2001 From: yonigozlan Date: Mon, 25 Nov 2024 21:03:03 +0000 Subject: [PATCH 2/2] update to new inits --- .../models/deformable_detr/__init__.py | 83 +++-------------- .../configuration_deformable_detr.py | 3 + .../feature_extraction_deformable_detr.py | 3 + .../image_processing_deformable_detr.py | 3 + .../image_processing_deformable_detr_fast.py | 3 + .../modeling_deformable_detr.py | 7 ++ src/transformers/models/detr/__init__.py | 82 ++--------------- .../models/detr/configuration_detr.py | 3 + .../models/detr/feature_extraction_detr.py | 3 + .../models/detr/image_processing_detr.py | 3 + .../models/detr/image_processing_detr_fast.py | 3 + src/transformers/models/detr/modeling_detr.py | 8 ++ src/transformers/models/rt_detr/__init__.py | 89 +++---------------- .../models/rt_detr/configuration_rt_detr.py | 3 + .../rt_detr/configuration_rt_detr_resnet.py | 3 + .../rt_detr/image_processing_rt_detr.py | 3 + .../rt_detr/image_processing_rt_detr_fast.py | 3 + .../models/rt_detr/modeling_rt_detr.py | 7 ++ .../models/rt_detr/modeling_rt_detr_resnet.py | 6 ++ 19 files changed, 94 insertions(+), 224 deletions(-) diff --git a/src/transformers/models/deformable_detr/__init__.py b/src/transformers/models/deformable_detr/__init__.py index 64ade815c418..16a1959c30ff 100644 --- a/src/transformers/models/deformable_detr/__init__.py +++ b/src/transformers/models/deformable_detr/__init__.py @@ -12,84 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import TYPE_CHECKING - -from ...utils import ( - OptionalDependencyNotAvailable, - _LazyModule, - is_torch_available, - is_torchvision_available, - is_vision_available, -) - - -_import_structure = { - "configuration_deformable_detr": ["DeformableDetrConfig"], -} -try: - if not is_vision_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["feature_extraction_deformable_detr"] = ["DeformableDetrFeatureExtractor"] - _import_structure["image_processing_deformable_detr"] = ["DeformableDetrImageProcessor"] - -try: - if not is_torchvision_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["image_processing_deformable_detr_fast"] = ["DeformableDetrImageProcessorFast"] +from typing import TYPE_CHECKING -try: - if not is_torch_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["modeling_deformable_detr"] = [ - "DeformableDetrForObjectDetection", - "DeformableDetrModel", - "DeformableDetrPreTrainedModel", - ] +from ...utils import _LazyModule +from ...utils.import_utils import define_import_structure if TYPE_CHECKING: - from .configuration_deformable_detr import DeformableDetrConfig - - try: - if not is_vision_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .feature_extraction_deformable_detr import DeformableDetrFeatureExtractor - from .image_processing_deformable_detr import DeformableDetrImageProcessor - - try: - if not is_torchvision_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .image_processing_deformable_detr_fast import DeformableDetrImageProcessorFast - - try: - if not is_torch_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .modeling_deformable_detr import ( - DeformableDetrForObjectDetection, - DeformableDetrModel, - DeformableDetrPreTrainedModel, - ) - + from .configuration_deformable_detr import * + from .feature_extraction_deformable_detr import * + from .image_processing_deformable_detr import * + from .image_processing_deformable_detr_fast import * + from .modeling_deformable_detr import * else: import sys - sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__) + _file = globals()["__file__"] + sys.modules[__name__] = _LazyModule(__name__, _file, define_import_structure(_file), module_spec=__spec__) diff --git a/src/transformers/models/deformable_detr/configuration_deformable_detr.py b/src/transformers/models/deformable_detr/configuration_deformable_detr.py index 495e1154dad3..05bd0f906a11 100644 --- a/src/transformers/models/deformable_detr/configuration_deformable_detr.py +++ b/src/transformers/models/deformable_detr/configuration_deformable_detr.py @@ -277,3 +277,6 @@ def num_attention_heads(self) -> int: @property def hidden_size(self) -> int: return self.d_model + + +__all__ = ["DeformableDetrConfig"] diff --git a/src/transformers/models/deformable_detr/feature_extraction_deformable_detr.py b/src/transformers/models/deformable_detr/feature_extraction_deformable_detr.py index f04743e91cee..de1676740647 100644 --- a/src/transformers/models/deformable_detr/feature_extraction_deformable_detr.py +++ b/src/transformers/models/deformable_detr/feature_extraction_deformable_detr.py @@ -41,3 +41,6 @@ def __init__(self, *args, **kwargs) -> None: FutureWarning, ) super().__init__(*args, **kwargs) + + +__all__ = ["DeformableDetrFeatureExtractor"] diff --git a/src/transformers/models/deformable_detr/image_processing_deformable_detr.py b/src/transformers/models/deformable_detr/image_processing_deformable_detr.py index 8c149f554965..0b6a58eb8f13 100644 --- a/src/transformers/models/deformable_detr/image_processing_deformable_detr.py +++ b/src/transformers/models/deformable_detr/image_processing_deformable_detr.py @@ -1627,3 +1627,6 @@ def post_process_object_detection( results.append({"scores": score, "labels": label, "boxes": box}) return results + + +__all__ = ["DeformableDetrImageProcessor"] diff --git a/src/transformers/models/deformable_detr/image_processing_deformable_detr_fast.py b/src/transformers/models/deformable_detr/image_processing_deformable_detr_fast.py index fde0540c5d49..0a2fbc14ee94 100644 --- a/src/transformers/models/deformable_detr/image_processing_deformable_detr_fast.py +++ b/src/transformers/models/deformable_detr/image_processing_deformable_detr_fast.py @@ -1055,3 +1055,6 @@ def post_process_object_detection( results.append({"scores": score, "labels": label, "boxes": box}) return results + + +__all__ = ["DeformableDetrImageProcessorFast"] diff --git a/src/transformers/models/deformable_detr/modeling_deformable_detr.py b/src/transformers/models/deformable_detr/modeling_deformable_detr.py index f47221e55ad8..3fd6914a6c62 100755 --- a/src/transformers/models/deformable_detr/modeling_deformable_detr.py +++ b/src/transformers/models/deformable_detr/modeling_deformable_detr.py @@ -2064,3 +2064,10 @@ def forward( ) return dict_outputs + + +__all__ = [ + "DeformableDetrForObjectDetection", + "DeformableDetrModel", + "DeformableDetrPreTrainedModel", +] diff --git a/src/transformers/models/detr/__init__.py b/src/transformers/models/detr/__init__.py index a3ee0b4e4743..4b8aae5e7038 100644 --- a/src/transformers/models/detr/__init__.py +++ b/src/transformers/models/detr/__init__.py @@ -14,82 +14,18 @@ from typing import TYPE_CHECKING -from ...utils import ( - OptionalDependencyNotAvailable, - _LazyModule, - is_torch_available, - is_torchvision_available, - is_vision_available, -) - - -_import_structure = {"configuration_detr": ["DetrConfig", "DetrOnnxConfig"]} - -try: - if not is_vision_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["feature_extraction_detr"] = ["DetrFeatureExtractor"] - _import_structure["image_processing_detr"] = ["DetrImageProcessor"] - -try: - if not is_torchvision_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["image_processing_detr_fast"] = ["DetrImageProcessorFast"] - -try: - if not is_torch_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["modeling_detr"] = [ - "DetrForObjectDetection", - "DetrForSegmentation", - "DetrModel", - "DetrPreTrainedModel", - ] +from ...utils import _LazyModule +from ...utils.import_utils import define_import_structure if TYPE_CHECKING: - from .configuration_detr import DetrConfig, DetrOnnxConfig - - try: - if not is_vision_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .feature_extraction_detr import DetrFeatureExtractor - from .image_processing_detr import DetrImageProcessor - - try: - if not is_torchvision_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .image_processing_detr_fast import DetrImageProcessorFast - - try: - if not is_torch_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .modeling_detr import ( - DetrForObjectDetection, - DetrForSegmentation, - DetrModel, - DetrPreTrainedModel, - ) - + from .configuration_detr import * + from .feature_extraction_detr import * + from .image_processing_detr import * + from .image_processing_detr_fast import * + from .modeling_detr import * else: import sys - sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__) + _file = globals()["__file__"] + sys.modules[__name__] = _LazyModule(__name__, _file, define_import_structure(_file), module_spec=__spec__) diff --git a/src/transformers/models/detr/configuration_detr.py b/src/transformers/models/detr/configuration_detr.py index 8b4a5b08dab2..90cd3b1345e3 100644 --- a/src/transformers/models/detr/configuration_detr.py +++ b/src/transformers/models/detr/configuration_detr.py @@ -284,3 +284,6 @@ def atol_for_validation(self) -> float: @property def default_onnx_opset(self) -> int: return 12 + + +__all__ = ["DetrConfig", "DetrOnnxConfig"] diff --git a/src/transformers/models/detr/feature_extraction_detr.py b/src/transformers/models/detr/feature_extraction_detr.py index 6ea33666466f..c2b292110997 100644 --- a/src/transformers/models/detr/feature_extraction_detr.py +++ b/src/transformers/models/detr/feature_extraction_detr.py @@ -41,3 +41,6 @@ def __init__(self, *args, **kwargs) -> None: FutureWarning, ) super().__init__(*args, **kwargs) + + +__all__ = ["DetrFeatureExtractor"] diff --git a/src/transformers/models/detr/image_processing_detr.py b/src/transformers/models/detr/image_processing_detr.py index 10d1b4d5d4a5..85fbe698d10a 100644 --- a/src/transformers/models/detr/image_processing_detr.py +++ b/src/transformers/models/detr/image_processing_detr.py @@ -2042,3 +2042,6 @@ def post_process_panoptic_segmentation( results.append({"segmentation": segmentation, "segments_info": segments}) return results + + +__all__ = ["DetrImageProcessor"] diff --git a/src/transformers/models/detr/image_processing_detr_fast.py b/src/transformers/models/detr/image_processing_detr_fast.py index 0d28d7df7a64..f010ffe27229 100644 --- a/src/transformers/models/detr/image_processing_detr_fast.py +++ b/src/transformers/models/detr/image_processing_detr_fast.py @@ -1495,3 +1495,6 @@ def post_process_panoptic_segmentation( results.append({"segmentation": segmentation, "segments_info": segments}) return results + + +__all__ = ["DetrImageProcessorFast"] diff --git a/src/transformers/models/detr/modeling_detr.py b/src/transformers/models/detr/modeling_detr.py index f51362d94e17..ac9a78671f8f 100644 --- a/src/transformers/models/detr/modeling_detr.py +++ b/src/transformers/models/detr/modeling_detr.py @@ -1805,3 +1805,11 @@ def forward(self, q, k, mask: Optional[Tensor] = None): weights = nn.functional.softmax(weights.flatten(2), dim=-1).view(weights.size()) weights = self.dropout(weights) return weights + + +__all__ = [ + "DetrForObjectDetection", + "DetrForSegmentation", + "DetrModel", + "DetrPreTrainedModel", +] diff --git a/src/transformers/models/rt_detr/__init__.py b/src/transformers/models/rt_detr/__init__.py index f7a6d56bbdb6..cd1fac5b679d 100644 --- a/src/transformers/models/rt_detr/__init__.py +++ b/src/transformers/models/rt_detr/__init__.py @@ -12,89 +12,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import TYPE_CHECKING - -from ...utils import ( - OptionalDependencyNotAvailable, - _LazyModule, - is_torch_available, - is_torchvision_available, - is_vision_available, -) - - -_import_structure = {"configuration_rt_detr": ["RTDetrConfig"], "configuration_rt_detr_resnet": ["RTDetrResNetConfig"]} -try: - if not is_vision_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["image_processing_rt_detr"] = ["RTDetrImageProcessor"] - -try: - if not is_torchvision_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["image_processing_rt_detr_fast"] = ["RTDetrImageProcessorFast"] +from typing import TYPE_CHECKING -try: - if not is_torch_available(): - raise OptionalDependencyNotAvailable() -except OptionalDependencyNotAvailable: - pass -else: - _import_structure["modeling_rt_detr"] = [ - "RTDetrForObjectDetection", - "RTDetrModel", - "RTDetrPreTrainedModel", - ] - _import_structure["modeling_rt_detr_resnet"] = [ - "RTDetrResNetBackbone", - "RTDetrResNetPreTrainedModel", - ] +from ...utils import _LazyModule +from ...utils.import_utils import define_import_structure if TYPE_CHECKING: - from .configuration_rt_detr import RTDetrConfig - from .configuration_rt_detr_resnet import RTDetrResNetConfig - - try: - if not is_vision_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .image_processing_rt_detr import RTDetrImageProcessor - - try: - if not is_torchvision_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .image_processing_rt_detr_fast import RTDetrImageProcessorFast - - try: - if not is_torch_available(): - raise OptionalDependencyNotAvailable() - except OptionalDependencyNotAvailable: - pass - else: - from .modeling_rt_detr import ( - RTDetrForObjectDetection, - RTDetrModel, - RTDetrPreTrainedModel, - ) - from .modeling_rt_detr_resnet import ( - RTDetrResNetBackbone, - RTDetrResNetPreTrainedModel, - ) - + from .configuration_rt_detr import * + from .configuration_rt_detr_resnet import * + from .image_processing_rt_detr import * + from .image_processing_rt_detr_fast import * + from .modeling_rt_detr import * + from .modeling_rt_detr_resnet import * else: import sys - sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__) + _file = globals()["__file__"] + sys.modules[__name__] = _LazyModule(__name__, _file, define_import_structure(_file), module_spec=__spec__) diff --git a/src/transformers/models/rt_detr/configuration_rt_detr.py b/src/transformers/models/rt_detr/configuration_rt_detr.py index ca20cc584dfd..3dc8ea550ad9 100644 --- a/src/transformers/models/rt_detr/configuration_rt_detr.py +++ b/src/transformers/models/rt_detr/configuration_rt_detr.py @@ -359,3 +359,6 @@ def from_backbone_configs(cls, backbone_config: PretrainedConfig, **kwargs): backbone_config=backbone_config, **kwargs, ) + + +__all__ = ["RTDetrConfig"] diff --git a/src/transformers/models/rt_detr/configuration_rt_detr_resnet.py b/src/transformers/models/rt_detr/configuration_rt_detr_resnet.py index fb46086296a4..35e74cd2f181 100644 --- a/src/transformers/models/rt_detr/configuration_rt_detr_resnet.py +++ b/src/transformers/models/rt_detr/configuration_rt_detr_resnet.py @@ -109,3 +109,6 @@ def __init__( self._out_features, self._out_indices = get_aligned_output_features_output_indices( out_features=out_features, out_indices=out_indices, stage_names=self.stage_names ) + + +__all__ = ["RTDetrResNetConfig"] diff --git a/src/transformers/models/rt_detr/image_processing_rt_detr.py b/src/transformers/models/rt_detr/image_processing_rt_detr.py index eead5b18693d..d031f40848fb 100644 --- a/src/transformers/models/rt_detr/image_processing_rt_detr.py +++ b/src/transformers/models/rt_detr/image_processing_rt_detr.py @@ -1097,3 +1097,6 @@ def post_process_object_detection( ) return results + + +__all__ = ["RTDetrImageProcessor"] diff --git a/src/transformers/models/rt_detr/image_processing_rt_detr_fast.py b/src/transformers/models/rt_detr/image_processing_rt_detr_fast.py index d447ee8c22ae..5d8d0f58328a 100644 --- a/src/transformers/models/rt_detr/image_processing_rt_detr_fast.py +++ b/src/transformers/models/rt_detr/image_processing_rt_detr_fast.py @@ -798,3 +798,6 @@ def post_process_object_detection( ) return results + + +__all__ = ["RTDetrImageProcessorFast"] diff --git a/src/transformers/models/rt_detr/modeling_rt_detr.py b/src/transformers/models/rt_detr/modeling_rt_detr.py index cae48455047e..da395743f60d 100644 --- a/src/transformers/models/rt_detr/modeling_rt_detr.py +++ b/src/transformers/models/rt_detr/modeling_rt_detr.py @@ -2162,3 +2162,10 @@ def forward( enc_outputs_coord_logits=outputs.enc_outputs_coord_logits, denoising_meta_values=outputs.denoising_meta_values, ) + + +__all__ = [ + "RTDetrForObjectDetection", + "RTDetrModel", + "RTDetrPreTrainedModel", +] diff --git a/src/transformers/models/rt_detr/modeling_rt_detr_resnet.py b/src/transformers/models/rt_detr/modeling_rt_detr_resnet.py index 84427dd24061..72ef9a0ac4db 100644 --- a/src/transformers/models/rt_detr/modeling_rt_detr_resnet.py +++ b/src/transformers/models/rt_detr/modeling_rt_detr_resnet.py @@ -432,3 +432,9 @@ def forward( hidden_states=outputs.hidden_states if output_hidden_states else None, attentions=None, ) + + +__all__ = [ + "RTDetrResNetBackbone", + "RTDetrResNetPreTrainedModel", +]