Skip to content

Commit 10b4e35

Browse files
authored
[Chore] remove deprecation from transformer2d regarding the output class. (#8698)
* remove deprecation from transformer2d regarding the output class. * up * deprecate more
1 parent ea6938a commit 10b4e35

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

docs/source/en/api/models/transformer2d.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ It is assumed one of the input classes is the masked latent pixel. The predicted
3838

3939
## Transformer2DModelOutput
4040

41-
[[autodoc]] models.transformers.transformer_2d.Transformer2DModelOutput
41+
[[autodoc]] models.modeling_outputs.Transformer2DModelOutput

src/diffusers/models/controlnet_sd3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
from ..loaders import FromOriginalModelMixin, PeftAdapterMixin
2424
from ..models.attention import JointTransformerBlock
2525
from ..models.attention_processor import Attention, AttentionProcessor
26+
from ..models.modeling_outputs import Transformer2DModelOutput
2627
from ..models.modeling_utils import ModelMixin
2728
from ..utils import USE_PEFT_BACKEND, is_torch_version, logging, scale_lora_layers, unscale_lora_layers
2829
from .controlnet import BaseOutput, zero_module
2930
from .embeddings import CombinedTimestepTextProjEmbeddings, PatchEmbed
30-
from .transformers.transformer_2d import Transformer2DModelOutput
3131

3232

3333
logger = logging.get_logger(__name__) # pylint: disable=invalid-name

src/diffusers/models/transformers/transformer_2d.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030

3131

3232
class Transformer2DModelOutput(Transformer2DModelOutput):
33-
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."
34-
deprecate("Transformer2DModelOutput", "1.0.0", deprecation_message)
33+
def __init__(self, *args, **kwargs):
34+
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."
35+
deprecate("Transformer2DModelOutput", "1.0.0", deprecation_message)
36+
super().__init__(*args, **kwargs)
3537

3638

3739
class Transformer2DModel(LegacyModelMixin, LegacyConfigMixin):

src/diffusers/models/transformers/transformer_sd3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from ...models.normalization import AdaLayerNormContinuous
2929
from ...utils import USE_PEFT_BACKEND, is_torch_version, logging, scale_lora_layers, unscale_lora_layers
3030
from ..embeddings import CombinedTimestepTextProjEmbeddings, PatchEmbed
31-
from .transformer_2d import Transformer2DModelOutput
31+
from ..modeling_outputs import Transformer2DModelOutput
3232

3333

3434
logger = logging.get_logger(__name__) # pylint: disable=invalid-name

0 commit comments

Comments
 (0)