Skip to content

Commit 1f0705a

Browse files
authored
[Big refactor] move unets to unets module 🦋 (#6630)
* move unets to module 🦋 * parameterize unet-level import. * fix flax unet2dcondition model import * models __init__ * mildly depcrecating models.unet_2d_blocks in favor of models.unets.unet_2d_blocks. * noqa * correct depcrecation behaviour * inherit from the actual classes. * Empty-Commit * backwards compatibility for unet_2d.py * backward compatibility for unet_2d_condition * bc for unet_1d * bc for unet_1d_blocks
1 parent 5e96333 commit 1f0705a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+6667
-6154
lines changed

docs/source/en/api/models/unet-motion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ The abstract from the paper is:
2222
[[autodoc]] UNetMotionModel
2323

2424
## UNet3DConditionOutput
25-
[[autodoc]] models.unet_3d_condition.UNet3DConditionOutput
25+
[[autodoc]] models.unets.unet_3d_condition.UNet3DConditionOutput

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ The abstract from the paper is:
2222
[[autodoc]] UNet1DModel
2323

2424
## UNet1DOutput
25-
[[autodoc]] models.unet_1d.UNet1DOutput
25+
[[autodoc]] models.unets.unet_1d.UNet1DOutput

docs/source/en/api/models/unet2d-cond.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ The abstract from the paper is:
2222
[[autodoc]] UNet2DConditionModel
2323

2424
## UNet2DConditionOutput
25-
[[autodoc]] models.unet_2d_condition.UNet2DConditionOutput
25+
[[autodoc]] models.unets.unet_2d_condition.UNet2DConditionOutput
2626

2727
## FlaxUNet2DConditionModel
28-
[[autodoc]] models.unet_2d_condition_flax.FlaxUNet2DConditionModel
28+
[[autodoc]] models.unets.unet_2d_condition_flax.FlaxUNet2DConditionModel
2929

3030
## FlaxUNet2DConditionOutput
31-
[[autodoc]] models.unet_2d_condition_flax.FlaxUNet2DConditionOutput
31+
[[autodoc]] models.unets.unet_2d_condition_flax.FlaxUNet2DConditionOutput

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ The abstract from the paper is:
2222
[[autodoc]] UNet2DModel
2323

2424
## UNet2DOutput
25-
[[autodoc]] models.unet_2d.UNet2DOutput
25+
[[autodoc]] models.unets.unet_2d.UNet2DOutput

docs/source/en/api/models/unet3d-cond.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ The abstract from the paper is:
2222
[[autodoc]] UNet3DConditionModel
2323

2424
## UNet3DConditionOutput
25-
[[autodoc]] models.unet_3d_condition.UNet3DConditionOutput
25+
[[autodoc]] models.unets.unet_3d_condition.UNet3DConditionOutput

examples/community/pipeline_animatediff_controlnet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from diffusers.loaders import IPAdapterMixin, LoraLoaderMixin, TextualInversionLoaderMixin
2727
from diffusers.models import AutoencoderKL, ControlNetModel, UNet2DConditionModel, UNetMotionModel
2828
from diffusers.models.lora import adjust_lora_scale_text_encoder
29-
from diffusers.models.unet_motion_model import MotionAdapter
29+
from diffusers.models.unets.unet_motion_model import MotionAdapter
3030
from diffusers.pipelines.controlnet.multicontrolnet import MultiControlNetModel
3131
from diffusers.pipelines.pipeline_utils import DiffusionPipeline
3232
from diffusers.schedulers import (

examples/community/stable_diffusion_controlnet_reference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from diffusers import StableDiffusionControlNetPipeline
99
from diffusers.models import ControlNetModel
1010
from diffusers.models.attention import BasicTransformerBlock
11-
from diffusers.models.unet_2d_blocks import CrossAttnDownBlock2D, CrossAttnUpBlock2D, DownBlock2D, UpBlock2D
11+
from diffusers.models.unets.unet_2d_blocks import CrossAttnDownBlock2D, CrossAttnUpBlock2D, DownBlock2D, UpBlock2D
1212
from diffusers.pipelines.controlnet.multicontrolnet import MultiControlNetModel
1313
from diffusers.pipelines.stable_diffusion import StableDiffusionPipelineOutput
1414
from diffusers.utils import logging

examples/community/stable_diffusion_reference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from diffusers import StableDiffusionPipeline
99
from diffusers.models.attention import BasicTransformerBlock
10-
from diffusers.models.unet_2d_blocks import CrossAttnDownBlock2D, CrossAttnUpBlock2D, DownBlock2D, UpBlock2D
10+
from diffusers.models.unets.unet_2d_blocks import CrossAttnDownBlock2D, CrossAttnUpBlock2D, DownBlock2D, UpBlock2D
1111
from diffusers.pipelines.stable_diffusion import StableDiffusionPipelineOutput
1212
from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion import rescale_noise_cfg
1313
from diffusers.utils import PIL_INTERPOLATION, logging

examples/community/stable_diffusion_xl_reference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from diffusers import StableDiffusionXLPipeline
1010
from diffusers.models.attention import BasicTransformerBlock
11-
from diffusers.models.unet_2d_blocks import (
11+
from diffusers.models.unets.unet_2d_blocks import (
1212
CrossAttnDownBlock2D,
1313
CrossAttnUpBlock2D,
1414
DownBlock2D,

examples/research_projects/controlnetxs/controlnetxs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from diffusers.models.autoencoders import AutoencoderKL
2727
from diffusers.models.lora import LoRACompatibleConv
2828
from diffusers.models.modeling_utils import ModelMixin
29-
from diffusers.models.unet_2d_blocks import (
29+
from diffusers.models.unets.unet_2d_blocks import (
3030
CrossAttnDownBlock2D,
3131
CrossAttnUpBlock2D,
3232
DownBlock2D,
@@ -36,7 +36,7 @@
3636
UpBlock2D,
3737
Upsample2D,
3838
)
39-
from diffusers.models.unet_2d_condition import UNet2DConditionModel
39+
from diffusers.models.unets.unet_2d_condition import UNet2DConditionModel
4040
from diffusers.utils import BaseOutput, logging
4141

4242

0 commit comments

Comments
 (0)