From 64b20500dcead52cbd6e9aca4e4d227f1fcec6cb Mon Sep 17 00:00:00 2001 From: Sayak Paul Date: Wed, 26 Jun 2024 23:05:36 +0530 Subject: [PATCH] [Chore] remove deprecation from transformer2d regarding the output class. (#8698) * remove deprecation from transformer2d regarding the output class. * up * deprecate more --- docs/source/en/api/models/transformer2d.md | 2 +- src/diffusers/models/controlnet_sd3.py | 2 +- src/diffusers/models/transformers/transformer_2d.py | 6 ++++-- src/diffusers/models/transformers/transformer_sd3.py | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/source/en/api/models/transformer2d.md b/docs/source/en/api/models/transformer2d.md index 6440aa3dd1..077ccbb6b2 100644 --- a/docs/source/en/api/models/transformer2d.md +++ b/docs/source/en/api/models/transformer2d.md @@ -38,4 +38,4 @@ It is assumed one of the input classes is the masked latent pixel. The predicted ## Transformer2DModelOutput -[[autodoc]] models.transformers.transformer_2d.Transformer2DModelOutput +[[autodoc]] models.modeling_outputs.Transformer2DModelOutput diff --git a/src/diffusers/models/controlnet_sd3.py b/src/diffusers/models/controlnet_sd3.py index d32b662b46..0560f4d7bd 100644 --- a/src/diffusers/models/controlnet_sd3.py +++ b/src/diffusers/models/controlnet_sd3.py @@ -23,11 +23,11 @@ from ..configuration_utils import ConfigMixin, register_to_config from ..loaders import FromOriginalModelMixin, PeftAdapterMixin from ..models.attention import JointTransformerBlock from ..models.attention_processor import Attention, AttentionProcessor +from ..models.modeling_outputs import Transformer2DModelOutput from ..models.modeling_utils import ModelMixin from ..utils import USE_PEFT_BACKEND, is_torch_version, logging, scale_lora_layers, unscale_lora_layers from .controlnet import BaseOutput, zero_module from .embeddings import CombinedTimestepTextProjEmbeddings, PatchEmbed -from .transformers.transformer_2d import Transformer2DModelOutput logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/models/transformers/transformer_2d.py b/src/diffusers/models/transformers/transformer_2d.py index aa259de6b0..c7c19e4582 100644 --- a/src/diffusers/models/transformers/transformer_2d.py +++ b/src/diffusers/models/transformers/transformer_2d.py @@ -30,8 +30,10 @@ logger = logging.get_logger(__name__) # pylint: disable=invalid-name class Transformer2DModelOutput(Transformer2DModelOutput): - deprecation_message = "Importing `Transformer2DModelOutput` from `diffusers.models.transformer_2d` is deprecated and this will be removed in a future version. Please use `from diffusers.models.modeling_outputs import Transformer2DModelOutput`, instead." - deprecate("Transformer2DModelOutput", "1.0.0", deprecation_message) + def __init__(self, *args, **kwargs): + deprecation_message = "Importing `Transformer2DModelOutput` from `diffusers.models.transformer_2d` is deprecated and this will be removed in a future version. Please use `from diffusers.models.modeling_outputs import Transformer2DModelOutput`, instead." + deprecate("Transformer2DModelOutput", "1.0.0", deprecation_message) + super().__init__(*args, **kwargs) class Transformer2DModel(LegacyModelMixin, LegacyConfigMixin): diff --git a/src/diffusers/models/transformers/transformer_sd3.py b/src/diffusers/models/transformers/transformer_sd3.py index 677ed4e287..ae05143ecc 100644 --- a/src/diffusers/models/transformers/transformer_sd3.py +++ b/src/diffusers/models/transformers/transformer_sd3.py @@ -26,7 +26,7 @@ from ...models.modeling_utils import ModelMixin from ...models.normalization import AdaLayerNormContinuous from ...utils import USE_PEFT_BACKEND, is_torch_version, logging, scale_lora_layers, unscale_lora_layers from ..embeddings import CombinedTimestepTextProjEmbeddings, PatchEmbed -from .transformer_2d import Transformer2DModelOutput +from ..modeling_outputs import Transformer2DModelOutput logger = logging.get_logger(__name__) # pylint: disable=invalid-name