From c68db8014ffe401efad676df873f71008b3282f0 Mon Sep 17 00:00:00 2001 From: DN6 Date: Thu, 17 Apr 2025 00:29:31 +0530 Subject: [PATCH 01/32] update --- src/diffusers/pipelines/__init__.py | 76 ++- .../pipelines/deprecated/__init__.py | 120 +++- .../alt_diffusion/pipeline_alt_diffusion.py | 4 +- .../pipeline_alt_diffusion_img2img.py | 4 +- .../{ => deprecated}/amused/__init__.py | 6 +- .../amused/pipeline_amused.py | 10 +- .../amused/pipeline_amused_img2img.py | 10 +- .../amused/pipeline_amused_inpaint.py | 10 +- .../pipeline_audio_diffusion.py | 2 +- .../pipelines/deprecated/audioldm/__init__.py | 51 ++ .../deprecated/audioldm/pipeline_audioldm.py | 563 ++++++++++++++++++ .../controlnet_xs/__init__.py | 10 +- .../controlnet_xs/pipeline_controlnet_xs.py | 22 +- .../pipeline_controlnet_xs_sd_xl.py | 24 +- .../dance_diffusion/__init__.py | 2 +- .../pipeline_dance_diffusion.py | 8 +- .../{ => deprecated}/i2vgen_xl/__init__.py | 6 +- .../i2vgen_xl/pipeline_i2vgen_xl.py | 14 +- .../{ => deprecated}/latte/__init__.py | 6 +- .../{ => deprecated}/latte/pipeline_latte.py | 14 +- .../{ => deprecated}/musicldm/__init__.py | 6 +- .../musicldm/pipeline_musicldm.py | 10 +- .../paint_by_example/__init__.py | 6 +- .../paint_by_example/image_encoder.py | 2 +- .../pipeline_paint_by_example.py | 10 +- .../{ => deprecated}/pia/__init__.py | 6 +- .../{ => deprecated}/pia/pipeline_pia.py | 26 +- .../semantic_stable_diffusion/__init__.py | 6 +- .../pipeline_output.py | 2 +- .../pipeline_semantic_stable_diffusion.py | 10 +- .../{ => deprecated}/shap_e/__init__.py | 6 +- .../{ => deprecated}/shap_e/camera.py | 0 .../shap_e/pipeline_shap_e.py | 8 +- .../shap_e/pipeline_shap_e_img2img.py | 8 +- .../{ => deprecated}/shap_e/renderer.py | 2 +- .../pipeline_spectrogram_diffusion.py | 2 +- .../__init__.py | 6 +- ...line_stable_diffusion_attend_and_excite.py | 16 +- .../stable_diffusion_diffedit/__init__.py | 6 +- .../pipeline_stable_diffusion_diffedit.py | 14 +- .../stable_diffusion_gligen/__init__.py | 6 +- .../pipeline_stable_diffusion_gligen.py | 16 +- ...line_stable_diffusion_gligen_text_image.py | 16 +- .../stable_diffusion_k_diffusion/__init__.py | 6 +- .../pipeline_stable_diffusion_k_diffusion.py | 16 +- ...ipeline_stable_diffusion_xl_k_diffusion.py | 18 +- .../stable_diffusion_ldm3d/__init__.py | 6 +- .../pipeline_stable_diffusion_ldm3d.py | 14 +- .../stable_diffusion_panorama/__init__.py | 6 +- .../pipeline_stable_diffusion_panorama.py | 14 +- .../stable_diffusion_safe/__init__.py | 6 +- .../stable_diffusion_safe/pipeline_output.py | 2 +- .../pipeline_stable_diffusion_safe.py | 12 +- .../stable_diffusion_safe/safety_checker.py | 2 +- .../stable_diffusion_sag/__init__.py | 6 +- .../pipeline_stable_diffusion_sag.py | 14 +- .../pipeline_cycle_diffusion.py | 6 +- ...ne_onnx_stable_diffusion_inpaint_legacy.py | 4 +- ...ipeline_stable_diffusion_inpaint_legacy.py | 6 +- ...pipeline_stable_diffusion_model_editing.py | 6 +- .../pipeline_stable_diffusion_paradigms.py | 6 +- .../pipeline_stable_diffusion_pix2pix_zero.py | 6 +- .../text_to_video_synthesis/__init__.py | 6 +- .../pipeline_output.py | 2 +- .../pipeline_text_to_video_synth.py | 14 +- .../pipeline_text_to_video_synth_img2img.py | 14 +- .../pipeline_text_to_video_zero.py | 14 +- .../pipeline_text_to_video_zero_sdxl.py | 18 +- .../{ => deprecated}/unclip/__init__.py | 6 +- .../unclip/pipeline_unclip.py | 10 +- .../unclip/pipeline_unclip_image_variation.py | 10 +- .../{ => deprecated}/unclip/text_proj.py | 0 .../{ => deprecated}/unidiffuser/__init__.py | 6 +- .../unidiffuser/modeling_text_decoder.py | 0 .../unidiffuser/modeling_uvit.py | 2 +- .../unidiffuser/pipeline_unidiffuser.py | 24 +- .../pipeline_versatile_diffusion.py | 2 +- .../{ => deprecated}/wuerstchen/__init__.py | 6 +- .../wuerstchen/modeling_paella_vq_model.py | 2 +- .../wuerstchen/modeling_wuerstchen_common.py | 0 .../modeling_wuerstchen_diffnext.py | 0 .../wuerstchen/modeling_wuerstchen_prior.py | 0 .../wuerstchen/pipeline_wuerstchen.py | 8 +- .../pipeline_wuerstchen_combined.py | 4 +- .../wuerstchen/pipeline_wuerstchen_prior.py | 8 +- 85 files changed, 1090 insertions(+), 374 deletions(-) rename src/diffusers/pipelines/{ => deprecated}/amused/__init__.py (91%) rename src/diffusers/pipelines/{ => deprecated}/amused/pipeline_amused.py (98%) rename src/diffusers/pipelines/{ => deprecated}/amused/pipeline_amused_img2img.py (98%) rename src/diffusers/pipelines/{ => deprecated}/amused/pipeline_amused_inpaint.py (98%) create mode 100644 src/diffusers/pipelines/deprecated/audioldm/__init__.py create mode 100644 src/diffusers/pipelines/deprecated/audioldm/pipeline_audioldm.py rename src/diffusers/pipelines/{ => deprecated}/controlnet_xs/__init__.py (84%) rename src/diffusers/pipelines/{ => deprecated}/controlnet_xs/pipeline_controlnet_xs.py (98%) rename src/diffusers/pipelines/{ => deprecated}/controlnet_xs/pipeline_controlnet_xs_sd_xl.py (98%) rename src/diffusers/pipelines/{ => deprecated}/dance_diffusion/__init__.py (87%) rename src/diffusers/pipelines/{ => deprecated}/dance_diffusion/pipeline_dance_diffusion.py (97%) rename src/diffusers/pipelines/{ => deprecated}/i2vgen_xl/__init__.py (86%) rename src/diffusers/pipelines/{ => deprecated}/i2vgen_xl/pipeline_i2vgen_xl.py (99%) rename src/diffusers/pipelines/{ => deprecated}/latte/__init__.py (86%) rename src/diffusers/pipelines/{ => deprecated}/latte/pipeline_latte.py (99%) rename src/diffusers/pipelines/{ => deprecated}/musicldm/__init__.py (88%) rename src/diffusers/pipelines/{ => deprecated}/musicldm/pipeline_musicldm.py (99%) rename src/diffusers/pipelines/{ => deprecated}/paint_by_example/__init__.py (89%) rename src/diffusers/pipelines/{ => deprecated}/paint_by_example/image_encoder.py (98%) rename src/diffusers/pipelines/{ => deprecated}/paint_by_example/pipeline_paint_by_example.py (99%) rename src/diffusers/pipelines/{ => deprecated}/pia/__init__.py (88%) rename src/diffusers/pipelines/{ => deprecated}/pia/pipeline_pia.py (98%) rename src/diffusers/pipelines/{ => deprecated}/semantic_stable_diffusion/__init__.py (88%) rename src/diffusers/pipelines/{ => deprecated}/semantic_stable_diffusion/pipeline_output.py (95%) rename src/diffusers/pipelines/{ => deprecated}/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py (99%) rename src/diffusers/pipelines/{ => deprecated}/shap_e/__init__.py (91%) rename src/diffusers/pipelines/{ => deprecated}/shap_e/camera.py (100%) rename src/diffusers/pipelines/{ => deprecated}/shap_e/pipeline_shap_e.py (98%) rename src/diffusers/pipelines/{ => deprecated}/shap_e/pipeline_shap_e_img2img.py (98%) rename src/diffusers/pipelines/{ => deprecated}/shap_e/renderer.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_attend_and_excite/__init__.py (87%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_diffedit/__init__.py (87%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_gligen/__init__.py (89%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_k_diffusion/__init__.py (89%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py (98%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py (98%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_ldm3d/__init__.py (87%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_panorama/__init__.py (87%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_safe/__init__.py (94%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_safe/pipeline_output.py (98%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_safe/pipeline_stable_diffusion_safe.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_safe/safety_checker.py (99%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_sag/__init__.py (87%) rename src/diffusers/pipelines/{ => deprecated}/stable_diffusion_sag/pipeline_stable_diffusion_sag.py (99%) rename src/diffusers/pipelines/{ => deprecated}/text_to_video_synthesis/__init__.py (90%) rename src/diffusers/pipelines/{ => deprecated}/text_to_video_synthesis/pipeline_output.py (96%) rename src/diffusers/pipelines/{ => deprecated}/text_to_video_synthesis/pipeline_text_to_video_synth.py (98%) rename src/diffusers/pipelines/{ => deprecated}/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py (98%) rename src/diffusers/pipelines/{ => deprecated}/text_to_video_synthesis/pipeline_text_to_video_zero.py (99%) rename src/diffusers/pipelines/{ => deprecated}/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py (99%) rename src/diffusers/pipelines/{ => deprecated}/unclip/__init__.py (87%) rename src/diffusers/pipelines/{ => deprecated}/unclip/pipeline_unclip.py (98%) rename src/diffusers/pipelines/{ => deprecated}/unclip/pipeline_unclip_image_variation.py (98%) rename src/diffusers/pipelines/{ => deprecated}/unclip/text_proj.py (100%) rename src/diffusers/pipelines/{ => deprecated}/unidiffuser/__init__.py (91%) rename src/diffusers/pipelines/{ => deprecated}/unidiffuser/modeling_text_decoder.py (100%) rename src/diffusers/pipelines/{ => deprecated}/unidiffuser/modeling_uvit.py (99%) rename src/diffusers/pipelines/{ => deprecated}/unidiffuser/pipeline_unidiffuser.py (98%) rename src/diffusers/pipelines/{ => deprecated}/wuerstchen/__init__.py (91%) rename src/diffusers/pipelines/{ => deprecated}/wuerstchen/modeling_paella_vq_model.py (99%) rename src/diffusers/pipelines/{ => deprecated}/wuerstchen/modeling_wuerstchen_common.py (100%) rename src/diffusers/pipelines/{ => deprecated}/wuerstchen/modeling_wuerstchen_diffnext.py (100%) rename src/diffusers/pipelines/{ => deprecated}/wuerstchen/modeling_wuerstchen_prior.py (100%) rename src/diffusers/pipelines/{ => deprecated}/wuerstchen/pipeline_wuerstchen.py (98%) rename src/diffusers/pipelines/{ => deprecated}/wuerstchen/pipeline_wuerstchen_combined.py (99%) rename src/diffusers/pipelines/{ => deprecated}/wuerstchen/pipeline_wuerstchen_prior.py (98%) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 011f23ed371c..f58fff33771b 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -115,10 +115,43 @@ "VersatileDiffusionImageVariationPipeline", "VersatileDiffusionPipeline", "VersatileDiffusionTextToImagePipeline", + "AmusedImg2ImgPipeline", + "AmusedInpaintPipeline", + "AmusedPipeline", + "StableDiffusionControlNetXSPipeline", + "StableDiffusionXLControlNetXSPipeline", + "I2VGenXLPipeline", + "LattePipeline", + "MusicLDMPipeline", + "PaintByExamplePipeline", + "PIAPipeline", + "SemanticStableDiffusionPipeline", + "ShapEImg2ImgPipeline", + "ShapEPipeline", + "StableDiffusionAttendAndExcitePipeline", + "StableDiffusionPipelineSafe", + "StableDiffusionSAGPipeline", + "StableDiffusionGLIGENPipeline", + "StableDiffusionGLIGENTextImagePipeline", + "StableDiffusionDiffEditPipeline", + "StableDiffusionLDM3DPipeline", + "StableDiffusionPanoramaPipeline", + "TextToVideoSDPipeline", + "TextToVideoZeroPipeline", + "TextToVideoZeroSDXLPipeline", + "VideoToVideoSDPipeline", + "UnCLIPImageVariationPipeline", + "UnCLIPPipeline", + "ImageTextPipelineOutput", + "UniDiffuserModel", + "UniDiffuserPipeline", + "UniDiffuserTextDecoder", + "WuerstchenCombinedPipeline", + "WuerstchenDecoderPipeline", + "WuerstchenPriorPipeline", ] ) _import_structure["allegro"] = ["AllegroPipeline"] - _import_structure["amused"] = ["AmusedImg2ImgPipeline", "AmusedInpaintPipeline", "AmusedPipeline"] _import_structure["animatediff"] = [ "AnimateDiffPipeline", "AnimateDiffControlNetPipeline", @@ -191,12 +224,6 @@ "SanaPAGPipeline", ] ) - _import_structure["controlnet_xs"].extend( - [ - "StableDiffusionControlNetXSPipeline", - "StableDiffusionXLControlNetXSPipeline", - ] - ) _import_structure["controlnet_hunyuandit"].extend( [ "HunyuanDiTControlNetPipeline", @@ -264,7 +291,6 @@ "LEditsPPPipelineStableDiffusionXL", ] ) - _import_structure["latte"] = ["LattePipeline"] _import_structure["ltx"] = ["LTXPipeline", "LTXImageToVideoPipeline", "LTXConditionPipeline"] _import_structure["lumina"] = ["LuminaPipeline", "LuminaText2ImgPipeline"] _import_structure["lumina2"] = ["Lumina2Pipeline", "Lumina2Text2ImgPipeline"] @@ -276,14 +302,9 @@ ] ) _import_structure["mochi"] = ["MochiPipeline"] - _import_structure["musicldm"] = ["MusicLDMPipeline"] _import_structure["omnigen"] = ["OmniGenPipeline"] - _import_structure["paint_by_example"] = ["PaintByExamplePipeline"] - _import_structure["pia"] = ["PIAPipeline"] _import_structure["pixart_alpha"] = ["PixArtAlphaPipeline", "PixArtSigmaPipeline"] _import_structure["sana"] = ["SanaPipeline", "SanaSprintPipeline", "SanaControlNetPipeline"] - _import_structure["semantic_stable_diffusion"] = ["SemanticStableDiffusionPipeline"] - _import_structure["shap_e"] = ["ShapEImg2ImgPipeline", "ShapEPipeline"] _import_structure["stable_audio"] = [ "StableAudioProjectionModel", "StableAudioPipeline", @@ -315,13 +336,6 @@ "StableDiffusion3Img2ImgPipeline", "StableDiffusion3InpaintPipeline", ] - _import_structure["stable_diffusion_attend_and_excite"] = ["StableDiffusionAttendAndExcitePipeline"] - _import_structure["stable_diffusion_safe"] = ["StableDiffusionPipelineSafe"] - _import_structure["stable_diffusion_sag"] = ["StableDiffusionSAGPipeline"] - _import_structure["stable_diffusion_gligen"] = [ - "StableDiffusionGLIGENPipeline", - "StableDiffusionGLIGENTextImagePipeline", - ] _import_structure["stable_video_diffusion"] = ["StableVideoDiffusionPipeline"] _import_structure["stable_diffusion_xl"].extend( [ @@ -331,32 +345,10 @@ "StableDiffusionXLPipeline", ] ) - _import_structure["stable_diffusion_diffedit"] = ["StableDiffusionDiffEditPipeline"] - _import_structure["stable_diffusion_ldm3d"] = ["StableDiffusionLDM3DPipeline"] - _import_structure["stable_diffusion_panorama"] = ["StableDiffusionPanoramaPipeline"] _import_structure["t2i_adapter"] = [ "StableDiffusionAdapterPipeline", "StableDiffusionXLAdapterPipeline", ] - _import_structure["text_to_video_synthesis"] = [ - "TextToVideoSDPipeline", - "TextToVideoZeroPipeline", - "TextToVideoZeroSDXLPipeline", - "VideoToVideoSDPipeline", - ] - _import_structure["i2vgen_xl"] = ["I2VGenXLPipeline"] - _import_structure["unclip"] = ["UnCLIPImageVariationPipeline", "UnCLIPPipeline"] - _import_structure["unidiffuser"] = [ - "ImageTextPipelineOutput", - "UniDiffuserModel", - "UniDiffuserPipeline", - "UniDiffuserTextDecoder", - ] - _import_structure["wuerstchen"] = [ - "WuerstchenCombinedPipeline", - "WuerstchenDecoderPipeline", - "WuerstchenPriorPipeline", - ] _import_structure["wan"] = ["WanPipeline", "WanImageToVideoPipeline", "WanVideoToVideoPipeline"] try: if not is_onnx_available(): diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index 9936323170ad..6464752f5b5b 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -1,4 +1,8 @@ from typing import TYPE_CHECKING +import functools +import inspect +import warnings +import sys from ...utils import ( DIFFUSERS_SLOW_IMPORT, @@ -12,6 +16,27 @@ ) +# Custom Lazy Module for deprecated pipelines that shows a warning +class _DeprecatedLazyModule(_LazyModule): + """ + Module class that surfaces all objects but only performs associated imports when the objects are requested, + and shows deprecation warnings when any of its attributes are accessed. + """ + + def __getattr__(self, name): + # Regular attribute access - first check if it's supposed to be loaded + if name in self._modules or name in self._class_to_module: + # Only warn for actual pipeline components, not utility functions + warnings.warn( + f"{name} is deprecated and will no longer be maintained.", + FutureWarning, + stacklevel=2, + ) + + # Use the standard lazy module behavior to load the attribute + return super().__getattr__(name) + + _dummy_objects = {} _import_structure = {} @@ -23,6 +48,7 @@ _dummy_objects.update(get_objects_from_module(dummy_pt_objects)) else: + _import_structure["dance_diffusion"] = ["DanceDiffusionPipeline"] _import_structure["latent_diffusion_uncond"] = ["LDMPipeline"] _import_structure["pndm"] = ["PNDMPipeline"] _import_structure["repaint"] = ["RePaintPipeline"] @@ -42,13 +68,36 @@ "AltDiffusionPipeline", "AltDiffusionPipelineOutput", ] - _import_structure["versatile_diffusion"] = [ - "VersatileDiffusionDualGuidedPipeline", - "VersatileDiffusionImageVariationPipeline", - "VersatileDiffusionPipeline", - "VersatileDiffusionTextToImagePipeline", + _import_structure["amused"] = ["AmusedPipeline", "AmusedImg2ImgPipeline", "AmusedInpaintPipeline"] + _import_structure["audioldm"] = ["AudioLDMPipeline"] + _import_structure["controlnet_xs"] = [ + "StableDiffusionControlNetXSPipeline", + "StableDiffusionXLControlNetXSPipeline", ] - _import_structure["vq_diffusion"] = ["VQDiffusionPipeline"] + _import_structure["i2vgen_xl"] = ["I2VGenXLPipeline"] + _import_structure["latte"] = ["LattePipeline"] + _import_structure["musicldm"] = ["MusicLDMPipeline"] + _import_structure["paint_by_example"] = ["PaintByExamplePipeline"] + _import_structure["pia"] = ["PIAPipeline"] + _import_structure["semantic_stable_diffusion"] = ["SemanticStableDiffusionPipeline"] + _import_structure["shap_e"] = [ + "ShapEPipeline", + "ShapEImg2ImgPipeline", + ] + _import_structure["stable_diffusion_attend_and_excite"] = ["StableDiffusionAttendAndExcitePipeline"] + _import_structure["stable_diffusion_diffedit"] = ["StableDiffusionDiffEditPipeline"] + _import_structure["stable_diffusion_gligen"] = [ + "StableDiffusionGLIGENPipeline", + "StableDiffusionGLIGENTextImagePipeline", + ] + _import_structure["stable_diffusion_k_diffusion"] = [ + "StableDiffusionKDiffusionPipeline", + "StableDiffusionXLKDiffusionPipeline", + ] + _import_structure["stable_diffusion_ldm3d"] = ["StableDiffusionLDM3DPipeline"] + _import_structure["stable_diffusion_panorama"] = ["StableDiffusionPanoramaPipeline"] + _import_structure["stable_diffusion_safe"] = ["StableDiffusionPipelineSafe"] + _import_structure["stable_diffusion_sag"] = ["StableDiffusionSAGPipeline"] _import_structure["stable_diffusion_variants"] = [ "CycleDiffusionPipeline", "StableDiffusionInpaintPipelineLegacy", @@ -56,6 +105,30 @@ "StableDiffusionParadigmsPipeline", "StableDiffusionModelEditingPipeline", ] + _import_structure["text_to_video_synthesis"] = [ + "TextToVideoSDPipeline", + "TextToVideoZeroPipeline", + "TextToVideoZeroSDXLPipeline", + ] + _import_structure["unclip"] = [ + "UnCLIPPipeline", + "UnCLIPImageVariationPipeline", + ] + _import_structure["unidiffuser"] = [ + "UniDiffuserPipeline", + ] + _import_structure["versatile_diffusion"] = [ + "VersatileDiffusionDualGuidedPipeline", + "VersatileDiffusionImageVariationPipeline", + "VersatileDiffusionPipeline", + "VersatileDiffusionTextToImagePipeline", + ] + _import_structure["vq_diffusion"] = ["VQDiffusionPipeline"] + _import_structure["wuerstchen"] = [ + "WuerstchenCombinedPipeline", + "WuerstchenDecoderPipeline", + "WuerstchenPriorPipeline", + ] try: if not (is_torch_available() and is_librosa_available()): @@ -88,6 +161,7 @@ from ...utils.dummy_pt_objects import * else: + from .dance_diffusion import DanceDiffusionPipeline from .latent_diffusion_uncond import LDMPipeline from .pndm import PNDMPipeline from .repaint import RePaintPipeline @@ -102,8 +176,26 @@ else: from .alt_diffusion import AltDiffusionImg2ImgPipeline, AltDiffusionPipeline, AltDiffusionPipelineOutput - from .audio_diffusion import AudioDiffusionPipeline, Mel - from .spectrogram_diffusion import SpectrogramDiffusionPipeline + from .audioldm import AudioLDMPipeline + from .controlnet_xs import StableDiffusionControlNetXSPipeline, StableDiffusionXLControlNetXSPipeline + from .i2vgen_xl import I2VGenXLPipeline + from .latte import LattePipeline + from .musicldm import MusicLDMPipeline + from .paint_by_example import PaintByExamplePipeline + from .pia import PIAPipeline + from .semantic_stable_diffusion import SemanticStableDiffusionPipeline + from .shap_e import ShapEPipeline, ShapEImg2ImgPipeline + from .stable_diffusion_attend_and_excite import StableDiffusionAttendAndExcitePipeline + from .stable_diffusion_diffedit import StableDiffusionDiffEditPipeline + from .stable_diffusion_gligen import StableDiffusionGLIGENPipeline, StableDiffusionGLIGENTextImagePipeline + from .stable_diffusion_k_diffusion import ( + StableDiffusionKDiffusionPipeline, + StableDiffusionXLKDiffusionPipeline, + ) + from .stable_diffusion_ldm3d import StableDiffusionLDM3DPipeline + from .stable_diffusion_panorama import StableDiffusionPanoramaPipeline + from .stable_diffusion_safe import StableDiffusionPipelineSafe + from .stable_diffusion_sag import StableDiffusionSAGPipeline from .stable_diffusion_variants import ( CycleDiffusionPipeline, StableDiffusionInpaintPipelineLegacy, @@ -111,7 +203,13 @@ StableDiffusionParadigmsPipeline, StableDiffusionPix2PixZeroPipeline, ) - from .stochastic_karras_ve import KarrasVePipeline + from .text_to_video_synthesis import ( + TextToVideoSDPipeline, + TextToVideoZeroPipeline, + TextToVideoZeroSDXLPipeline, + ) + from .unclip import UnCLIPPipeline, UnCLIPImageVariationPipeline + from .unidiffuser import UniDiffuserPipeline from .versatile_diffusion import ( VersatileDiffusionDualGuidedPipeline, VersatileDiffusionImageVariationPipeline, @@ -119,6 +217,7 @@ VersatileDiffusionTextToImagePipeline, ) from .vq_diffusion import VQDiffusionPipeline + from .wuerstchen import WuerstchenCombinedPipeline, WuerstchenDecoderPipeline, WuerstchenPriorPipeline try: if not (is_torch_available() and is_librosa_available()): @@ -143,7 +242,8 @@ else: import sys - sys.modules[__name__] = _LazyModule( + # Use the custom deprecated lazy module instead of the standard one + sys.modules[__name__] = _DeprecatedLazyModule( __name__, globals()["__file__"], _import_structure, diff --git a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py index 48c0aa4f6d76..6fc9e1ec397c 100644 --- a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py +++ b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py @@ -39,8 +39,8 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .modeling_roberta_series import RobertaSeriesModelWithTransformation from .pipeline_output import AltDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py index fa70689d790d..563c81d1cea2 100644 --- a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py +++ b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py @@ -42,8 +42,8 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .modeling_roberta_series import RobertaSeriesModelWithTransformation from .pipeline_output import AltDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/amused/__init__.py b/src/diffusers/pipelines/deprecated/amused/__init__.py similarity index 91% rename from src/diffusers/pipelines/amused/__init__.py rename to src/diffusers/pipelines/deprecated/amused/__init__.py index 3c4d07a426b5..2812eadf6f99 100644 --- a/src/diffusers/pipelines/amused/__init__.py +++ b/src/diffusers/pipelines/deprecated/amused/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -16,7 +16,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import ( + from ....utils.dummy_torch_and_transformers_objects import ( AmusedImg2ImgPipeline, AmusedInpaintPipeline, AmusedPipeline, @@ -40,7 +40,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import ( + from ....utils.dummy_torch_and_transformers_objects import ( AmusedPipeline, ) else: diff --git a/src/diffusers/pipelines/amused/pipeline_amused.py b/src/diffusers/pipelines/deprecated/amused/pipeline_amused.py similarity index 98% rename from src/diffusers/pipelines/amused/pipeline_amused.py rename to src/diffusers/pipelines/deprecated/amused/pipeline_amused.py index 12f7dc7c59d4..eeedc37b1377 100644 --- a/src/diffusers/pipelines/amused/pipeline_amused.py +++ b/src/diffusers/pipelines/deprecated/amused/pipeline_amused.py @@ -17,11 +17,11 @@ import torch from transformers import CLIPTextModelWithProjection, CLIPTokenizer -from ...image_processor import VaeImageProcessor -from ...models import UVit2DModel, VQModel -from ...schedulers import AmusedScheduler -from ...utils import is_torch_xla_available, replace_example_docstring -from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput +from ....image_processor import VaeImageProcessor +from ....models import UVit2DModel, VQModel +from ....schedulers import AmusedScheduler +from ....utils import is_torch_xla_available, replace_example_docstring +from ...pipeline_utils import DiffusionPipeline, ImagePipelineOutput if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/amused/pipeline_amused_img2img.py b/src/diffusers/pipelines/deprecated/amused/pipeline_amused_img2img.py similarity index 98% rename from src/diffusers/pipelines/amused/pipeline_amused_img2img.py rename to src/diffusers/pipelines/deprecated/amused/pipeline_amused_img2img.py index 7ac05b39c3a8..2ff1e503fcb8 100644 --- a/src/diffusers/pipelines/amused/pipeline_amused_img2img.py +++ b/src/diffusers/pipelines/deprecated/amused/pipeline_amused_img2img.py @@ -17,11 +17,11 @@ import torch from transformers import CLIPTextModelWithProjection, CLIPTokenizer -from ...image_processor import PipelineImageInput, VaeImageProcessor -from ...models import UVit2DModel, VQModel -from ...schedulers import AmusedScheduler -from ...utils import is_torch_xla_available, replace_example_docstring -from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput +from ....image_processor import PipelineImageInput, VaeImageProcessor +from ....models import UVit2DModel, VQModel +from ....schedulers import AmusedScheduler +from ....utils import is_torch_xla_available, replace_example_docstring +from ...pipeline_utils import DiffusionPipeline, ImagePipelineOutput if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/amused/pipeline_amused_inpaint.py b/src/diffusers/pipelines/deprecated/amused/pipeline_amused_inpaint.py similarity index 98% rename from src/diffusers/pipelines/amused/pipeline_amused_inpaint.py rename to src/diffusers/pipelines/deprecated/amused/pipeline_amused_inpaint.py index d908c32745c2..534e2b47d719 100644 --- a/src/diffusers/pipelines/amused/pipeline_amused_inpaint.py +++ b/src/diffusers/pipelines/deprecated/amused/pipeline_amused_inpaint.py @@ -18,11 +18,11 @@ import torch from transformers import CLIPTextModelWithProjection, CLIPTokenizer -from ...image_processor import PipelineImageInput, VaeImageProcessor -from ...models import UVit2DModel, VQModel -from ...schedulers import AmusedScheduler -from ...utils import is_torch_xla_available, replace_example_docstring -from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput +from ....image_processor import PipelineImageInput, VaeImageProcessor +from ....models import UVit2DModel, VQModel +from ....schedulers import AmusedScheduler +from ....utils import is_torch_xla_available, replace_example_docstring +from ...pipeline_utils import DiffusionPipeline, ImagePipelineOutput if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/audio_diffusion/pipeline_audio_diffusion.py b/src/diffusers/pipelines/deprecated/audio_diffusion/pipeline_audio_diffusion.py index 47044e050acf..663e474344bc 100644 --- a/src/diffusers/pipelines/deprecated/audio_diffusion/pipeline_audio_diffusion.py +++ b/src/diffusers/pipelines/deprecated/audio_diffusion/pipeline_audio_diffusion.py @@ -23,7 +23,7 @@ from ....models import AutoencoderKL, UNet2DConditionModel from ....schedulers import DDIMScheduler, DDPMScheduler from ....utils.torch_utils import randn_tensor -from ...pipeline_utils import AudioPipelineOutput, BaseOutput, DiffusionPipeline, ImagePipelineOutput +from ..pipeline_utils import AudioPipelineOutput, BaseOutput, DiffusionPipeline, ImagePipelineOutput from .mel import Mel diff --git a/src/diffusers/pipelines/deprecated/audioldm/__init__.py b/src/diffusers/pipelines/deprecated/audioldm/__init__.py new file mode 100644 index 000000000000..75b11bf2789f --- /dev/null +++ b/src/diffusers/pipelines/deprecated/audioldm/__init__.py @@ -0,0 +1,51 @@ +from typing import TYPE_CHECKING + +from ....utils import ( + DIFFUSERS_SLOW_IMPORT, + OptionalDependencyNotAvailable, + _LazyModule, + is_torch_available, + is_transformers_available, + is_transformers_version, +) + + +_dummy_objects = {} +_import_structure = {} + +try: + if not (is_transformers_available() and is_torch_available() and is_transformers_version(">=", "4.27.0")): + raise OptionalDependencyNotAvailable() +except OptionalDependencyNotAvailable: + from ....utils.dummy_torch_and_transformers_objects import ( + AudioLDMPipeline, + ) + + _dummy_objects.update({"AudioLDMPipeline": AudioLDMPipeline}) +else: + _import_structure["pipeline_audioldm"] = ["AudioLDMPipeline"] + + +if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: + try: + if not (is_transformers_available() and is_torch_available() and is_transformers_version(">=", "4.27.0")): + raise OptionalDependencyNotAvailable() + except OptionalDependencyNotAvailable: + from ....utils.dummy_torch_and_transformers_objects import ( + AudioLDMPipeline, + ) + + else: + from .pipeline_audioldm import AudioLDMPipeline +else: + import sys + + sys.modules[__name__] = _LazyModule( + __name__, + globals()["__file__"], + _import_structure, + module_spec=__spec__, + ) + + for name, value in _dummy_objects.items(): + setattr(sys.modules[__name__], name, value) diff --git a/src/diffusers/pipelines/deprecated/audioldm/pipeline_audioldm.py b/src/diffusers/pipelines/deprecated/audioldm/pipeline_audioldm.py new file mode 100644 index 000000000000..307325e7e7e2 --- /dev/null +++ b/src/diffusers/pipelines/deprecated/audioldm/pipeline_audioldm.py @@ -0,0 +1,563 @@ +# Copyright 2024 The HuggingFace Team. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import inspect +from typing import Any, Callable, Dict, List, Optional, Union + +import numpy as np +import torch +import torch.nn.functional as F +from transformers import ClapTextModelWithProjection, RobertaTokenizer, RobertaTokenizerFast, SpeechT5HifiGan + +from ....models import AutoencoderKL, UNet2DConditionModel +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import is_torch_xla_available, logging, replace_example_docstring +from ....utils.torch_utils import randn_tensor +from ..pipeline_utils import AudioPipelineOutput, DiffusionPipeline, StableDiffusionMixin + + +if is_torch_xla_available(): + import torch_xla.core.xla_model as xm + + XLA_AVAILABLE = True +else: + XLA_AVAILABLE = False + +logger = logging.get_logger(__name__) # pylint: disable=invalid-name + + +EXAMPLE_DOC_STRING = """ + Examples: + ```py + >>> from diffusers import AudioLDMPipeline + >>> import torch + >>> import scipy + + >>> repo_id = "cvssp/audioldm-s-full-v2" + >>> pipe = AudioLDMPipeline.from_pretrained(repo_id, torch_dtype=torch.float16) + >>> pipe = pipe.to("cuda") + + >>> prompt = "Techno music with a strong, upbeat tempo and high melodic riffs" + >>> audio = pipe(prompt, num_inference_steps=10, audio_length_in_s=5.0).audios[0] + + >>> # save the audio sample as a .wav file + >>> scipy.io.wavfile.write("techno.wav", rate=16000, data=audio) + ``` +""" + + +class AudioLDMPipeline(DiffusionPipeline, StableDiffusionMixin): + r""" + Pipeline for text-to-audio generation using AudioLDM. + + This model inherits from [`DiffusionPipeline`]. Check the superclass documentation for the generic methods + implemented for all pipelines (downloading, saving, running on a particular device, etc.). + + Args: + vae ([`AutoencoderKL`]): + Variational Auto-Encoder (VAE) model to encode and decode images to and from latent representations. + text_encoder ([`~transformers.ClapTextModelWithProjection`]): + Frozen text-encoder (`ClapTextModelWithProjection`, specifically the + [laion/clap-htsat-unfused](https://huggingface.co/laion/clap-htsat-unfused) variant. + tokenizer ([`PreTrainedTokenizer`]): + A [`~transformers.RobertaTokenizer`] to tokenize text. + unet ([`UNet2DConditionModel`]): + A `UNet2DConditionModel` to denoise the encoded audio latents. + scheduler ([`SchedulerMixin`]): + A scheduler to be used in combination with `unet` to denoise the encoded audio latents. Can be one of + [`DDIMScheduler`], [`LMSDiscreteScheduler`], or [`PNDMScheduler`]. + vocoder ([`~transformers.SpeechT5HifiGan`]): + Vocoder of class `SpeechT5HifiGan`. + """ + + model_cpu_offload_seq = "text_encoder->unet->vae" + + def __init__( + self, + vae: AutoencoderKL, + text_encoder: ClapTextModelWithProjection, + tokenizer: Union[RobertaTokenizer, RobertaTokenizerFast], + unet: UNet2DConditionModel, + scheduler: KarrasDiffusionSchedulers, + vocoder: SpeechT5HifiGan, + ): + super().__init__() + + logger.warning(f"{self.__class__.__name__} is deprecated and will no longer be actively maintained") + + logger.warning( + f"{self.__class__.__name__} is deprecated and will no longer be actively maintained" + ) + + self.register_modules( + vae=vae, + text_encoder=text_encoder, + tokenizer=tokenizer, + unet=unet, + scheduler=scheduler, + vocoder=vocoder, + ) + self.vae_scale_factor = 2 ** (len(self.vae.config.block_out_channels) - 1) if getattr(self, "vae", None) else 8 + + def _encode_prompt( + self, + prompt, + device, + num_waveforms_per_prompt, + do_classifier_free_guidance, + negative_prompt=None, + prompt_embeds: Optional[torch.Tensor] = None, + negative_prompt_embeds: Optional[torch.Tensor] = None, + ): + r""" + Encodes the prompt into text encoder hidden states. + + Args: + prompt (`str` or `List[str]`, *optional*): + prompt to be encoded + device (`torch.device`): + torch device + num_waveforms_per_prompt (`int`): + number of waveforms that should be generated per prompt + do_classifier_free_guidance (`bool`): + whether to use classifier free guidance or not + negative_prompt (`str` or `List[str]`, *optional*): + The prompt or prompts not to guide the audio generation. If not defined, one has to pass + `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is + less than `1`). + prompt_embeds (`torch.Tensor`, *optional*): + Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not + provided, text embeddings will be generated from `prompt` input argument. + negative_prompt_embeds (`torch.Tensor`, *optional*): + Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt + weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input + argument. + """ + if prompt is not None and isinstance(prompt, str): + batch_size = 1 + elif prompt is not None and isinstance(prompt, list): + batch_size = len(prompt) + else: + batch_size = prompt_embeds.shape[0] + + if prompt_embeds is None: + text_inputs = self.tokenizer( + prompt, + padding="max_length", + max_length=self.tokenizer.model_max_length, + truncation=True, + return_tensors="pt", + ) + text_input_ids = text_inputs.input_ids + attention_mask = text_inputs.attention_mask + untruncated_ids = self.tokenizer(prompt, padding="longest", return_tensors="pt").input_ids + + if untruncated_ids.shape[-1] >= text_input_ids.shape[-1] and not torch.equal( + text_input_ids, untruncated_ids + ): + removed_text = self.tokenizer.batch_decode( + untruncated_ids[:, self.tokenizer.model_max_length - 1 : -1] + ) + logger.warning( + "The following part of your input was truncated because CLAP can only handle sequences up to" + f" {self.tokenizer.model_max_length} tokens: {removed_text}" + ) + + prompt_embeds = self.text_encoder( + text_input_ids.to(device), + attention_mask=attention_mask.to(device), + ) + prompt_embeds = prompt_embeds.text_embeds + # additional L_2 normalization over each hidden-state + prompt_embeds = F.normalize(prompt_embeds, dim=-1) + + prompt_embeds = prompt_embeds.to(dtype=self.text_encoder.dtype, device=device) + + ( + bs_embed, + seq_len, + ) = prompt_embeds.shape + # duplicate text embeddings for each generation per prompt, using mps friendly method + prompt_embeds = prompt_embeds.repeat(1, num_waveforms_per_prompt) + prompt_embeds = prompt_embeds.view(bs_embed * num_waveforms_per_prompt, seq_len) + + # get unconditional embeddings for classifier free guidance + if do_classifier_free_guidance and negative_prompt_embeds is None: + uncond_tokens: List[str] + if negative_prompt is None: + uncond_tokens = [""] * batch_size + elif type(prompt) is not type(negative_prompt): + raise TypeError( + f"`negative_prompt` should be the same type to `prompt`, but got {type(negative_prompt)} !=" + f" {type(prompt)}." + ) + elif isinstance(negative_prompt, str): + uncond_tokens = [negative_prompt] + elif batch_size != len(negative_prompt): + raise ValueError( + f"`negative_prompt`: {negative_prompt} has batch size {len(negative_prompt)}, but `prompt`:" + f" {prompt} has batch size {batch_size}. Please make sure that passed `negative_prompt` matches" + " the batch size of `prompt`." + ) + else: + uncond_tokens = negative_prompt + + max_length = prompt_embeds.shape[1] + uncond_input = self.tokenizer( + uncond_tokens, + padding="max_length", + max_length=max_length, + truncation=True, + return_tensors="pt", + ) + + uncond_input_ids = uncond_input.input_ids.to(device) + attention_mask = uncond_input.attention_mask.to(device) + + negative_prompt_embeds = self.text_encoder( + uncond_input_ids, + attention_mask=attention_mask, + ) + negative_prompt_embeds = negative_prompt_embeds.text_embeds + # additional L_2 normalization over each hidden-state + negative_prompt_embeds = F.normalize(negative_prompt_embeds, dim=-1) + + if do_classifier_free_guidance: + # duplicate unconditional embeddings for each generation per prompt, using mps friendly method + seq_len = negative_prompt_embeds.shape[1] + + negative_prompt_embeds = negative_prompt_embeds.to(dtype=self.text_encoder.dtype, device=device) + + negative_prompt_embeds = negative_prompt_embeds.repeat(1, num_waveforms_per_prompt) + negative_prompt_embeds = negative_prompt_embeds.view(batch_size * num_waveforms_per_prompt, seq_len) + + # For classifier free guidance, we need to do two forward passes. + # Here we concatenate the unconditional and text embeddings into a single batch + # to avoid doing two forward passes + prompt_embeds = torch.cat([negative_prompt_embeds, prompt_embeds]) + + return prompt_embeds + + def decode_latents(self, latents): + latents = 1 / self.vae.config.scaling_factor * latents + mel_spectrogram = self.vae.decode(latents).sample + return mel_spectrogram + + def mel_spectrogram_to_waveform(self, mel_spectrogram): + if mel_spectrogram.dim() == 4: + mel_spectrogram = mel_spectrogram.squeeze(1) + + waveform = self.vocoder(mel_spectrogram) + # we always cast to float32 as this does not cause significant overhead and is compatible with bfloat16 + waveform = waveform.cpu().float() + return waveform + + # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline.prepare_extra_step_kwargs + def prepare_extra_step_kwargs(self, generator, eta): + # prepare extra kwargs for the scheduler step, since not all schedulers have the same signature + # eta (η) is only used with the DDIMScheduler, it will be ignored for other schedulers. + # eta corresponds to η in DDIM paper: https://arxiv.org/abs/2010.02502 + # and should be between [0, 1] + + accepts_eta = "eta" in set(inspect.signature(self.scheduler.step).parameters.keys()) + extra_step_kwargs = {} + if accepts_eta: + extra_step_kwargs["eta"] = eta + + # check if the scheduler accepts generator + accepts_generator = "generator" in set(inspect.signature(self.scheduler.step).parameters.keys()) + if accepts_generator: + extra_step_kwargs["generator"] = generator + return extra_step_kwargs + + def check_inputs( + self, + prompt, + audio_length_in_s, + vocoder_upsample_factor, + callback_steps, + negative_prompt=None, + prompt_embeds=None, + negative_prompt_embeds=None, + ): + min_audio_length_in_s = vocoder_upsample_factor * self.vae_scale_factor + if audio_length_in_s < min_audio_length_in_s: + raise ValueError( + f"`audio_length_in_s` has to be a positive value greater than or equal to {min_audio_length_in_s}, but " + f"is {audio_length_in_s}." + ) + + if self.vocoder.config.model_in_dim % self.vae_scale_factor != 0: + raise ValueError( + f"The number of frequency bins in the vocoder's log-mel spectrogram has to be divisible by the " + f"VAE scale factor, but got {self.vocoder.config.model_in_dim} bins and a scale factor of " + f"{self.vae_scale_factor}." + ) + + if (callback_steps is None) or ( + callback_steps is not None and (not isinstance(callback_steps, int) or callback_steps <= 0) + ): + raise ValueError( + f"`callback_steps` has to be a positive integer but is {callback_steps} of type" + f" {type(callback_steps)}." + ) + + if prompt is not None and prompt_embeds is not None: + raise ValueError( + f"Cannot forward both `prompt`: {prompt} and `prompt_embeds`: {prompt_embeds}. Please make sure to" + " only forward one of the two." + ) + elif prompt is None and prompt_embeds is None: + raise ValueError( + "Provide either `prompt` or `prompt_embeds`. Cannot leave both `prompt` and `prompt_embeds` undefined." + ) + elif prompt is not None and (not isinstance(prompt, str) and not isinstance(prompt, list)): + raise ValueError(f"`prompt` has to be of type `str` or `list` but is {type(prompt)}") + + if negative_prompt is not None and negative_prompt_embeds is not None: + raise ValueError( + f"Cannot forward both `negative_prompt`: {negative_prompt} and `negative_prompt_embeds`:" + f" {negative_prompt_embeds}. Please make sure to only forward one of the two." + ) + + if prompt_embeds is not None and negative_prompt_embeds is not None: + if prompt_embeds.shape != negative_prompt_embeds.shape: + raise ValueError( + "`prompt_embeds` and `negative_prompt_embeds` must have the same shape when passed directly, but" + f" got: `prompt_embeds` {prompt_embeds.shape} != `negative_prompt_embeds`" + f" {negative_prompt_embeds.shape}." + ) + + # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline.prepare_latents with width->self.vocoder.config.model_in_dim + def prepare_latents(self, batch_size, num_channels_latents, height, dtype, device, generator, latents=None): + shape = ( + batch_size, + num_channels_latents, + int(height) // self.vae_scale_factor, + int(self.vocoder.config.model_in_dim) // self.vae_scale_factor, + ) + if isinstance(generator, list) and len(generator) != batch_size: + raise ValueError( + f"You have passed a list of generators of length {len(generator)}, but requested an effective batch" + f" size of {batch_size}. Make sure the batch size matches the length of the generators." + ) + + if latents is None: + latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) + else: + latents = latents.to(device) + + # scale the initial noise by the standard deviation required by the scheduler + latents = latents * self.scheduler.init_noise_sigma + return latents + + @torch.no_grad() + @replace_example_docstring(EXAMPLE_DOC_STRING) + def __call__( + self, + prompt: Union[str, List[str]] = None, + audio_length_in_s: Optional[float] = None, + num_inference_steps: int = 10, + guidance_scale: float = 2.5, + negative_prompt: Optional[Union[str, List[str]]] = None, + num_waveforms_per_prompt: Optional[int] = 1, + eta: float = 0.0, + generator: Optional[Union[torch.Generator, List[torch.Generator]]] = None, + latents: Optional[torch.Tensor] = None, + prompt_embeds: Optional[torch.Tensor] = None, + negative_prompt_embeds: Optional[torch.Tensor] = None, + return_dict: bool = True, + callback: Optional[Callable[[int, int, torch.Tensor], None]] = None, + callback_steps: Optional[int] = 1, + cross_attention_kwargs: Optional[Dict[str, Any]] = None, + output_type: Optional[str] = "np", + ): + r""" + The call function to the pipeline for generation. + + Args: + prompt (`str` or `List[str]`, *optional*): + The prompt or prompts to guide audio generation. If not defined, you need to pass `prompt_embeds`. + audio_length_in_s (`int`, *optional*, defaults to 5.12): + The length of the generated audio sample in seconds. + num_inference_steps (`int`, *optional*, defaults to 10): + The number of denoising steps. More denoising steps usually lead to a higher quality audio at the + expense of slower inference. + guidance_scale (`float`, *optional*, defaults to 2.5): + A higher guidance scale value encourages the model to generate audio that is closely linked to the text + `prompt` at the expense of lower sound quality. Guidance scale is enabled when `guidance_scale > 1`. + negative_prompt (`str` or `List[str]`, *optional*): + The prompt or prompts to guide what to not include in audio generation. If not defined, you need to + pass `negative_prompt_embeds` instead. Ignored when not using guidance (`guidance_scale < 1`). + num_waveforms_per_prompt (`int`, *optional*, defaults to 1): + The number of waveforms to generate per prompt. + eta (`float`, *optional*, defaults to 0.0): + Corresponds to parameter eta (η) from the [DDIM](https://arxiv.org/abs/2010.02502) paper. Only applies + to the [`~schedulers.DDIMScheduler`], and is ignored in other schedulers. + generator (`torch.Generator` or `List[torch.Generator]`, *optional*): + A [`torch.Generator`](https://pytorch.org/docs/stable/generated/torch.Generator.html) to make + generation deterministic. + latents (`torch.Tensor`, *optional*): + Pre-generated noisy latents sampled from a Gaussian distribution, to be used as inputs for image + generation. Can be used to tweak the same generation with different prompts. If not provided, a latents + tensor is generated by sampling using the supplied random `generator`. + prompt_embeds (`torch.Tensor`, *optional*): + Pre-generated text embeddings. Can be used to easily tweak text inputs (prompt weighting). If not + provided, text embeddings are generated from the `prompt` input argument. + negative_prompt_embeds (`torch.Tensor`, *optional*): + Pre-generated negative text embeddings. Can be used to easily tweak text inputs (prompt weighting). If + not provided, `negative_prompt_embeds` are generated from the `negative_prompt` input argument. + return_dict (`bool`, *optional*, defaults to `True`): + Whether or not to return a [`~pipelines.AudioPipelineOutput`] instead of a plain tuple. + callback (`Callable`, *optional*): + A function that calls every `callback_steps` steps during inference. The function is called with the + following arguments: `callback(step: int, timestep: int, latents: torch.Tensor)`. + callback_steps (`int`, *optional*, defaults to 1): + The frequency at which the `callback` function is called. If not specified, the callback is called at + every step. + cross_attention_kwargs (`dict`, *optional*): + A kwargs dictionary that if specified is passed along to the [`AttentionProcessor`] as defined in + [`self.processor`](https://github.com/huggingface/diffusers/blob/main/src/diffusers/models/attention_processor.py). + output_type (`str`, *optional*, defaults to `"np"`): + The output format of the generated image. Choose between `"np"` to return a NumPy `np.ndarray` or + `"pt"` to return a PyTorch `torch.Tensor` object. + + Examples: + + Returns: + [`~pipelines.AudioPipelineOutput`] or `tuple`: + If `return_dict` is `True`, [`~pipelines.AudioPipelineOutput`] is returned, otherwise a `tuple` is + returned where the first element is a list with the generated audio. + """ + # 0. Convert audio input length from seconds to spectrogram height + vocoder_upsample_factor = np.prod(self.vocoder.config.upsample_rates) / self.vocoder.config.sampling_rate + + if audio_length_in_s is None: + audio_length_in_s = self.unet.config.sample_size * self.vae_scale_factor * vocoder_upsample_factor + + height = int(audio_length_in_s / vocoder_upsample_factor) + + original_waveform_length = int(audio_length_in_s * self.vocoder.config.sampling_rate) + if height % self.vae_scale_factor != 0: + height = int(np.ceil(height / self.vae_scale_factor)) * self.vae_scale_factor + logger.info( + f"Audio length in seconds {audio_length_in_s} is increased to {height * vocoder_upsample_factor} " + f"so that it can be handled by the model. It will be cut to {audio_length_in_s} after the " + f"denoising process." + ) + + # 1. Check inputs. Raise error if not correct + self.check_inputs( + prompt, + audio_length_in_s, + vocoder_upsample_factor, + callback_steps, + negative_prompt, + prompt_embeds, + negative_prompt_embeds, + ) + + # 2. Define call parameters + if prompt is not None and isinstance(prompt, str): + batch_size = 1 + elif prompt is not None and isinstance(prompt, list): + batch_size = len(prompt) + else: + batch_size = prompt_embeds.shape[0] + + device = self._execution_device + # here `guidance_scale` is defined analog to the guidance weight `w` of equation (2) + # of the Imagen paper: https://arxiv.org/pdf/2205.11487.pdf . `guidance_scale = 1` + # corresponds to doing no classifier free guidance. + do_classifier_free_guidance = guidance_scale > 1.0 + + # 3. Encode input prompt + prompt_embeds = self._encode_prompt( + prompt, + device, + num_waveforms_per_prompt, + do_classifier_free_guidance, + negative_prompt, + prompt_embeds=prompt_embeds, + negative_prompt_embeds=negative_prompt_embeds, + ) + + # 4. Prepare timesteps + self.scheduler.set_timesteps(num_inference_steps, device=device) + timesteps = self.scheduler.timesteps + + # 5. Prepare latent variables + num_channels_latents = self.unet.config.in_channels + latents = self.prepare_latents( + batch_size * num_waveforms_per_prompt, + num_channels_latents, + height, + prompt_embeds.dtype, + device, + generator, + latents, + ) + + # 6. Prepare extra step kwargs + extra_step_kwargs = self.prepare_extra_step_kwargs(generator, eta) + + # 7. Denoising loop + num_warmup_steps = len(timesteps) - num_inference_steps * self.scheduler.order + with self.progress_bar(total=num_inference_steps) as progress_bar: + for i, t in enumerate(timesteps): + # expand the latents if we are doing classifier free guidance + latent_model_input = torch.cat([latents] * 2) if do_classifier_free_guidance else latents + latent_model_input = self.scheduler.scale_model_input(latent_model_input, t) + + # predict the noise residual + noise_pred = self.unet( + latent_model_input, + t, + encoder_hidden_states=None, + class_labels=prompt_embeds, + cross_attention_kwargs=cross_attention_kwargs, + ).sample + + # perform guidance + if do_classifier_free_guidance: + noise_pred_uncond, noise_pred_text = noise_pred.chunk(2) + noise_pred = noise_pred_uncond + guidance_scale * (noise_pred_text - noise_pred_uncond) + + # compute the previous noisy sample x_t -> x_t-1 + latents = self.scheduler.step(noise_pred, t, latents, **extra_step_kwargs).prev_sample + + # call the callback, if provided + if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0): + progress_bar.update() + if callback is not None and i % callback_steps == 0: + step_idx = i // getattr(self.scheduler, "order", 1) + callback(step_idx, t, latents) + + if XLA_AVAILABLE: + xm.mark_step() + + # 8. Post-processing + mel_spectrogram = self.decode_latents(latents) + + audio = self.mel_spectrogram_to_waveform(mel_spectrogram) + + audio = audio[:, :original_waveform_length] + + if output_type == "np": + audio = audio.numpy() + + if not return_dict: + return (audio,) + + return AudioPipelineOutput(audios=audio) diff --git a/src/diffusers/pipelines/controlnet_xs/__init__.py b/src/diffusers/pipelines/deprecated/controlnet_xs/__init__.py similarity index 84% rename from src/diffusers/pipelines/controlnet_xs/__init__.py rename to src/diffusers/pipelines/deprecated/controlnet_xs/__init__.py index 978278b184f9..422af210d478 100644 --- a/src/diffusers/pipelines/controlnet_xs/__init__.py +++ b/src/diffusers/pipelines/deprecated/controlnet_xs/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -28,7 +28,7 @@ if not (is_transformers_available() and is_flax_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_flax_and_transformers_objects # noqa F403 + from ....utils import dummy_flax_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_flax_and_transformers_objects)) else: @@ -41,7 +41,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_controlnet_xs import StableDiffusionControlNetXSPipeline from .pipeline_controlnet_xs_sd_xl import StableDiffusionXLControlNetXSPipeline @@ -50,7 +50,7 @@ if not (is_transformers_available() and is_flax_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_flax_and_transformers_objects import * # noqa F403 + from ....utils.dummy_flax_and_transformers_objects import * # noqa F403 else: pass # from .pipeline_flax_controlnet import FlaxStableDiffusionControlNetPipeline diff --git a/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs.py b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py similarity index 98% rename from src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs.py rename to src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py index 901ca25c576c..3dcb9a5a0dba 100644 --- a/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs.py +++ b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py @@ -21,13 +21,13 @@ import torch.nn.functional as F from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer -from ...callbacks import MultiPipelineCallbacks, PipelineCallback -from ...image_processor import PipelineImageInput, VaeImageProcessor -from ...loaders import FromSingleFileMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, ControlNetXSAdapter, UNet2DConditionModel, UNetControlNetXSModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....callbacks import MultiPipelineCallbacks, PipelineCallback +from ....image_processor import PipelineImageInput, VaeImageProcessor +from ....loaders import FromSingleFileMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, ControlNetXSAdapter, UNet2DConditionModel, UNetControlNetXSModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, deprecate, is_torch_xla_available, @@ -36,10 +36,10 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import is_compiled_module, is_torch_version, randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ....utils.torch_utils import is_compiled_module, is_torch_version, randn_tensor +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs_sd_xl.py b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py similarity index 98% rename from src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs_sd_xl.py rename to src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py index acf1f5489ec1..df1bac8f5f88 100644 --- a/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs_sd_xl.py +++ b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py @@ -28,33 +28,33 @@ from diffusers.utils.import_utils import is_invisible_watermark_available -from ...callbacks import MultiPipelineCallbacks, PipelineCallback -from ...image_processor import PipelineImageInput, VaeImageProcessor -from ...loaders import FromSingleFileMixin, StableDiffusionXLLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, ControlNetXSAdapter, UNet2DConditionModel, UNetControlNetXSModel -from ...models.attention_processor import ( +from ....callbacks import MultiPipelineCallbacks, PipelineCallback +from ....image_processor import PipelineImageInput, VaeImageProcessor +from ....loaders import FromSingleFileMixin, StableDiffusionXLLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, ControlNetXSAdapter, UNet2DConditionModel, UNetControlNetXSModel +from ....models.attention_processor import ( AttnProcessor2_0, XFormersAttnProcessor, ) -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, logging, replace_example_docstring, scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import is_compiled_module, is_torch_version, randn_tensor -from ..pipeline_utils import DiffusionPipeline -from ..stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput +from ....utils.torch_utils import is_compiled_module, is_torch_version, randn_tensor +from ...pipeline_utils import DiffusionPipeline +from ...stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput if is_invisible_watermark_available(): from ..stable_diffusion_xl.watermark import StableDiffusionXLWatermarker -from ...utils import is_torch_xla_available +from ....utils import is_torch_xla_available if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/dance_diffusion/__init__.py b/src/diffusers/pipelines/deprecated/dance_diffusion/__init__.py similarity index 87% rename from src/diffusers/pipelines/dance_diffusion/__init__.py rename to src/diffusers/pipelines/deprecated/dance_diffusion/__init__.py index 0d3e466dfa65..8dcd7467875f 100644 --- a/src/diffusers/pipelines/dance_diffusion/__init__.py +++ b/src/diffusers/pipelines/deprecated/dance_diffusion/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import DIFFUSERS_SLOW_IMPORT, _LazyModule +from ....utils import DIFFUSERS_SLOW_IMPORT, _LazyModule _import_structure = {"pipeline_dance_diffusion": ["DanceDiffusionPipeline"]} diff --git a/src/diffusers/pipelines/dance_diffusion/pipeline_dance_diffusion.py b/src/diffusers/pipelines/deprecated/dance_diffusion/pipeline_dance_diffusion.py similarity index 97% rename from src/diffusers/pipelines/dance_diffusion/pipeline_dance_diffusion.py rename to src/diffusers/pipelines/deprecated/dance_diffusion/pipeline_dance_diffusion.py index 34b2a3945572..0075eb8b3143 100644 --- a/src/diffusers/pipelines/dance_diffusion/pipeline_dance_diffusion.py +++ b/src/diffusers/pipelines/deprecated/dance_diffusion/pipeline_dance_diffusion.py @@ -17,10 +17,10 @@ import torch -from ...models import UNet1DModel -from ...schedulers import SchedulerMixin -from ...utils import is_torch_xla_available, logging -from ...utils.torch_utils import randn_tensor +from ....models import UNet1DModel +from ....schedulers import SchedulerMixin +from ....utils import is_torch_xla_available, logging +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import AudioPipelineOutput, DiffusionPipeline diff --git a/src/diffusers/pipelines/i2vgen_xl/__init__.py b/src/diffusers/pipelines/deprecated/i2vgen_xl/__init__.py similarity index 86% rename from src/diffusers/pipelines/i2vgen_xl/__init__.py rename to src/diffusers/pipelines/deprecated/i2vgen_xl/__init__.py index b24a7e4cee7f..43646542d9ea 100644 --- a/src/diffusers/pipelines/i2vgen_xl/__init__.py +++ b/src/diffusers/pipelines/deprecated/i2vgen_xl/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -17,7 +17,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -29,7 +29,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * # noqa F403 + from ....utils.dummy_torch_and_transformers_objects import * # noqa F403 else: from .pipeline_i2vgen_xl import I2VGenXLPipeline diff --git a/src/diffusers/pipelines/i2vgen_xl/pipeline_i2vgen_xl.py b/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py similarity index 99% rename from src/diffusers/pipelines/i2vgen_xl/pipeline_i2vgen_xl.py rename to src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py index 58d65a190d5b..e34a4ea26f98 100644 --- a/src/diffusers/pipelines/i2vgen_xl/pipeline_i2vgen_xl.py +++ b/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py @@ -21,18 +21,18 @@ import torch from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection -from ...image_processor import PipelineImageInput, VaeImageProcessor -from ...models import AutoencoderKL -from ...models.unets.unet_i2vgen_xl import I2VGenXLUNet -from ...schedulers import DDIMScheduler -from ...utils import ( +from ....image_processor import PipelineImageInput, VaeImageProcessor +from ....models import AutoencoderKL +from ....models.unets.unet_i2vgen_xl import I2VGenXLUNet +from ....schedulers import DDIMScheduler +from ....utils import ( BaseOutput, is_torch_xla_available, logging, replace_example_docstring, ) -from ...utils.torch_utils import randn_tensor -from ...video_processor import VideoProcessor +from ....utils.torch_utils import randn_tensor +from ....video_processor import VideoProcessor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin diff --git a/src/diffusers/pipelines/latte/__init__.py b/src/diffusers/pipelines/deprecated/latte/__init__.py similarity index 86% rename from src/diffusers/pipelines/latte/__init__.py rename to src/diffusers/pipelines/deprecated/latte/__init__.py index 4296b42e1253..dd3a04cf6335 100644 --- a/src/diffusers/pipelines/latte/__init__.py +++ b/src/diffusers/pipelines/deprecated/latte/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -30,7 +30,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_latte import LattePipeline diff --git a/src/diffusers/pipelines/latte/pipeline_latte.py b/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py similarity index 99% rename from src/diffusers/pipelines/latte/pipeline_latte.py rename to src/diffusers/pipelines/deprecated/latte/pipeline_latte.py index e9a95e8be45c..dfc1022a0b1e 100644 --- a/src/diffusers/pipelines/latte/pipeline_latte.py +++ b/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py @@ -23,11 +23,11 @@ import torch from transformers import T5EncoderModel, T5Tokenizer -from ...callbacks import MultiPipelineCallbacks, PipelineCallback -from ...models import AutoencoderKL, LatteTransformer3DModel -from ...pipelines.pipeline_utils import DiffusionPipeline -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....callbacks import MultiPipelineCallbacks, PipelineCallback +from ....models import AutoencoderKL, LatteTransformer3DModel +from ...pipeline_utils import DiffusionPipeline +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( BACKENDS_MAPPING, BaseOutput, deprecate, @@ -37,8 +37,8 @@ logging, replace_example_docstring, ) -from ...utils.torch_utils import is_compiled_module, randn_tensor -from ...video_processor import VideoProcessor +from ....utils.torch_utils import is_compiled_module, randn_tensor +from ....video_processor import VideoProcessor if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/musicldm/__init__.py b/src/diffusers/pipelines/deprecated/musicldm/__init__.py similarity index 88% rename from src/diffusers/pipelines/musicldm/__init__.py rename to src/diffusers/pipelines/deprecated/musicldm/__init__.py index ed71eeb1d99b..bc9f8d550401 100644 --- a/src/diffusers/pipelines/musicldm/__init__.py +++ b/src/diffusers/pipelines/deprecated/musicldm/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available() and is_transformers_version(">=", "4.27.0")): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -31,7 +31,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_musicldm import MusicLDMPipeline diff --git a/src/diffusers/pipelines/musicldm/pipeline_musicldm.py b/src/diffusers/pipelines/deprecated/musicldm/pipeline_musicldm.py similarity index 99% rename from src/diffusers/pipelines/musicldm/pipeline_musicldm.py rename to src/diffusers/pipelines/deprecated/musicldm/pipeline_musicldm.py index 73837af7d429..b1753756fffa 100644 --- a/src/diffusers/pipelines/musicldm/pipeline_musicldm.py +++ b/src/diffusers/pipelines/deprecated/musicldm/pipeline_musicldm.py @@ -26,16 +26,16 @@ SpeechT5HifiGan, ) -from ...models import AutoencoderKL, UNet2DConditionModel -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....models import AutoencoderKL, UNet2DConditionModel +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( is_accelerate_available, is_accelerate_version, is_librosa_available, logging, replace_example_docstring, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import AudioPipelineOutput, DiffusionPipeline, StableDiffusionMixin @@ -43,7 +43,7 @@ import librosa -from ...utils import is_torch_xla_available +from ....utils import is_torch_xla_available if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/paint_by_example/__init__.py b/src/diffusers/pipelines/deprecated/paint_by_example/__init__.py similarity index 89% rename from src/diffusers/pipelines/paint_by_example/__init__.py rename to src/diffusers/pipelines/deprecated/paint_by_example/__init__.py index aaa775f690c3..0364866ac336 100644 --- a/src/diffusers/pipelines/paint_by_example/__init__.py +++ b/src/diffusers/pipelines/deprecated/paint_by_example/__init__.py @@ -5,7 +5,7 @@ import PIL from PIL import Image -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -22,7 +22,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -36,7 +36,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .image_encoder import PaintByExampleImageEncoder from .pipeline_paint_by_example import PaintByExamplePipeline diff --git a/src/diffusers/pipelines/paint_by_example/image_encoder.py b/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py similarity index 98% rename from src/diffusers/pipelines/paint_by_example/image_encoder.py rename to src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py index 2fd0338b1f91..76482de4a2eb 100644 --- a/src/diffusers/pipelines/paint_by_example/image_encoder.py +++ b/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py @@ -16,7 +16,7 @@ from transformers import CLIPPreTrainedModel, CLIPVisionModel from ...models.attention import BasicTransformerBlock -from ...utils import logging +from ....utils import logging logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/paint_by_example/pipeline_paint_by_example.py b/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py similarity index 99% rename from src/diffusers/pipelines/paint_by_example/pipeline_paint_by_example.py rename to src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py index 288f269a6563..8454948a04f7 100644 --- a/src/diffusers/pipelines/paint_by_example/pipeline_paint_by_example.py +++ b/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py @@ -20,11 +20,11 @@ import torch from transformers import CLIPImageProcessor -from ...image_processor import VaeImageProcessor -from ...models import AutoencoderKL, UNet2DConditionModel -from ...schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler -from ...utils import deprecate, is_torch_xla_available, logging -from ...utils.torch_utils import randn_tensor +from ....image_processor import VaeImageProcessor +from ....models import AutoencoderKL, UNet2DConditionModel +from ....schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler +from ....utils import deprecate, is_torch_xla_available, logging +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/pia/__init__.py b/src/diffusers/pipelines/deprecated/pia/__init__.py similarity index 88% rename from src/diffusers/pipelines/pia/__init__.py rename to src/diffusers/pipelines/deprecated/pia/__init__.py index 16e8004966e5..8d0cae93a642 100644 --- a/src/diffusers/pipelines/pia/__init__.py +++ b/src/diffusers/pipelines/deprecated/pia/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -17,7 +17,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects + from ....utils import dummy_torch_and_transformers_objects _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -28,7 +28,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_pia import PIAPipeline, PIAPipelineOutput diff --git a/src/diffusers/pipelines/pia/pipeline_pia.py b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py similarity index 98% rename from src/diffusers/pipelines/pia/pipeline_pia.py rename to src/diffusers/pipelines/deprecated/pia/pipeline_pia.py index df8499ab900a..566c794b7839 100644 --- a/src/diffusers/pipelines/pia/pipeline_pia.py +++ b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py @@ -21,12 +21,17 @@ import torch from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection -from ...image_processor import PipelineImageInput -from ...loaders import FromSingleFileMixin, IPAdapterMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, ImageProjection, UNet2DConditionModel, UNetMotionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...models.unets.unet_motion_model import MotionAdapter -from ...schedulers import ( +from ....image_processor import PipelineImageInput +from ....loaders import ( + FromSingleFileMixin, + IPAdapterMixin, + StableDiffusionLoraLoaderMixin, + TextualInversionLoaderMixin, +) +from ....models import AutoencoderKL, ImageProjection, UNet2DConditionModel, UNetMotionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....models.unets.unet_motion_model import MotionAdapter +from ....schedulers import ( DDIMScheduler, DPMSolverMultistepScheduler, EulerAncestralDiscreteScheduler, @@ -34,7 +39,7 @@ LMSDiscreteScheduler, PNDMScheduler, ) -from ...utils import ( +from ....utils import ( USE_PEFT_BACKEND, BaseOutput, is_torch_xla_available, @@ -43,12 +48,11 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor -from ...video_processor import VideoProcessor +from ....utils.torch_utils import randn_tensor +from ....video_processor import VideoProcessor from ..free_init_utils import FreeInitMixin from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin - if is_torch_xla_available(): import torch_xla.core.xla_model as xm @@ -191,6 +195,8 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + + logger.warning(f"{self.__class__.__name__} is deprecated and will no longer be actively maintained") if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) diff --git a/src/diffusers/pipelines/semantic_stable_diffusion/__init__.py b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/__init__.py similarity index 88% rename from src/diffusers/pipelines/semantic_stable_diffusion/__init__.py rename to src/diffusers/pipelines/deprecated/semantic_stable_diffusion/__init__.py index 70f5b1a547c4..f55af15469fa 100644 --- a/src/diffusers/pipelines/semantic_stable_diffusion/__init__.py +++ b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -17,7 +17,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -31,7 +31,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_semantic_stable_diffusion import SemanticStableDiffusionPipeline diff --git a/src/diffusers/pipelines/semantic_stable_diffusion/pipeline_output.py b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_output.py similarity index 95% rename from src/diffusers/pipelines/semantic_stable_diffusion/pipeline_output.py rename to src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_output.py index 349912993981..fcfec3ad1629 100644 --- a/src/diffusers/pipelines/semantic_stable_diffusion/pipeline_output.py +++ b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_output.py @@ -4,7 +4,7 @@ import numpy as np import PIL.Image -from ...utils import BaseOutput +from ....utils import BaseOutput @dataclass diff --git a/src/diffusers/pipelines/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py similarity index 99% rename from src/diffusers/pipelines/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py rename to src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py index a8c374259349..53f5c7301488 100644 --- a/src/diffusers/pipelines/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py +++ b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py @@ -5,12 +5,12 @@ import torch from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer -from ...image_processor import VaeImageProcessor -from ...models import AutoencoderKL, UNet2DConditionModel +from ....image_processor import VaeImageProcessor +from ....models import AutoencoderKL, UNet2DConditionModel from ...pipelines.stable_diffusion.safety_checker import StableDiffusionSafetyChecker -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import deprecate, is_torch_xla_available, logging -from ...utils.torch_utils import randn_tensor +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import deprecate, is_torch_xla_available, logging +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from .pipeline_output import SemanticStableDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/shap_e/__init__.py b/src/diffusers/pipelines/deprecated/shap_e/__init__.py similarity index 91% rename from src/diffusers/pipelines/shap_e/__init__.py rename to src/diffusers/pipelines/deprecated/shap_e/__init__.py index 4ed563c4a51f..c80732bf4de2 100644 --- a/src/diffusers/pipelines/shap_e/__init__.py +++ b/src/diffusers/pipelines/deprecated/shap_e/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -17,7 +17,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -41,7 +41,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .camera import create_pan_cameras from .pipeline_shap_e import ShapEPipeline diff --git a/src/diffusers/pipelines/shap_e/camera.py b/src/diffusers/pipelines/deprecated/shap_e/camera.py similarity index 100% rename from src/diffusers/pipelines/shap_e/camera.py rename to src/diffusers/pipelines/deprecated/shap_e/camera.py diff --git a/src/diffusers/pipelines/shap_e/pipeline_shap_e.py b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py similarity index 98% rename from src/diffusers/pipelines/shap_e/pipeline_shap_e.py rename to src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py index ef8a95daefa4..6819107453e2 100644 --- a/src/diffusers/pipelines/shap_e/pipeline_shap_e.py +++ b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py @@ -21,15 +21,15 @@ import torch from transformers import CLIPTextModelWithProjection, CLIPTokenizer -from ...models import PriorTransformer -from ...schedulers import HeunDiscreteScheduler -from ...utils import ( +from ....models import PriorTransformer +from ....schedulers import HeunDiscreteScheduler +from ....utils import ( BaseOutput, is_torch_xla_available, logging, replace_example_docstring, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline from .renderer import ShapERenderer diff --git a/src/diffusers/pipelines/shap_e/pipeline_shap_e_img2img.py b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py similarity index 98% rename from src/diffusers/pipelines/shap_e/pipeline_shap_e_img2img.py rename to src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py index c0d1e38e0994..620bde9f01ef 100644 --- a/src/diffusers/pipelines/shap_e/pipeline_shap_e_img2img.py +++ b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py @@ -20,15 +20,15 @@ import torch from transformers import CLIPImageProcessor, CLIPVisionModel -from ...models import PriorTransformer -from ...schedulers import HeunDiscreteScheduler -from ...utils import ( +from ....models import PriorTransformer +from ....schedulers import HeunDiscreteScheduler +from ....utils import ( BaseOutput, is_torch_xla_available, logging, replace_example_docstring, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline from .renderer import ShapERenderer diff --git a/src/diffusers/pipelines/shap_e/renderer.py b/src/diffusers/pipelines/deprecated/shap_e/renderer.py similarity index 99% rename from src/diffusers/pipelines/shap_e/renderer.py rename to src/diffusers/pipelines/deprecated/shap_e/renderer.py index dd25945590cd..2510fe870ae1 100644 --- a/src/diffusers/pipelines/shap_e/renderer.py +++ b/src/diffusers/pipelines/deprecated/shap_e/renderer.py @@ -23,7 +23,7 @@ from ...configuration_utils import ConfigMixin, register_to_config from ...models import ModelMixin -from ...utils import BaseOutput +from ....utils import BaseOutput from .camera import create_pan_cameras diff --git a/src/diffusers/pipelines/deprecated/spectrogram_diffusion/pipeline_spectrogram_diffusion.py b/src/diffusers/pipelines/deprecated/spectrogram_diffusion/pipeline_spectrogram_diffusion.py index b8ac8e1416bf..242add16f395 100644 --- a/src/diffusers/pipelines/deprecated/spectrogram_diffusion/pipeline_spectrogram_diffusion.py +++ b/src/diffusers/pipelines/deprecated/spectrogram_diffusion/pipeline_spectrogram_diffusion.py @@ -28,7 +28,7 @@ if is_onnx_available(): from ...onnx_utils import OnnxRuntimeModel -from ...pipeline_utils import AudioPipelineOutput, DiffusionPipeline +from ..pipeline_utils import AudioPipelineOutput, DiffusionPipeline from .continuous_encoder import SpectrogramContEncoder from .notes_encoder import SpectrogramNotesEncoder diff --git a/src/diffusers/pipelines/stable_diffusion_attend_and_excite/__init__.py b/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/__init__.py similarity index 87% rename from src/diffusers/pipelines/stable_diffusion_attend_and_excite/__init__.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/__init__.py index cce556fceb23..2087f09ea580 100644 --- a/src/diffusers/pipelines/stable_diffusion_attend_and_excite/__init__.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -30,7 +30,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_stable_diffusion_attend_and_excite import StableDiffusionAttendAndExcitePipeline diff --git a/src/diffusers/pipelines/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py b/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py index 351b146fb423..eb09b478b359 100644 --- a/src/diffusers/pipelines/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py @@ -21,13 +21,13 @@ from torch.nn import functional as F from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer -from ...image_processor import VaeImageProcessor -from ...loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, UNet2DConditionModel -from ...models.attention_processor import Attention -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....image_processor import VaeImageProcessor +from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, UNet2DConditionModel +from ....models.attention_processor import Attention +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, deprecate, is_torch_xla_available, @@ -36,7 +36,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/stable_diffusion_diffedit/__init__.py b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/__init__.py similarity index 87% rename from src/diffusers/pipelines/stable_diffusion_diffedit/__init__.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/__init__.py index e2145edb96c6..3924c610274c 100644 --- a/src/diffusers/pipelines/stable_diffusion_diffedit/__init__.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -30,7 +30,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_stable_diffusion_diffedit import StableDiffusionDiffEditPipeline diff --git a/src/diffusers/pipelines/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py index 4b999662a6e7..9206a392ab61 100644 --- a/src/diffusers/pipelines/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py @@ -23,12 +23,12 @@ from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer from ...configuration_utils import FrozenDict -from ...image_processor import VaeImageProcessor -from ...loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, UNet2DConditionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import DDIMInverseScheduler, KarrasDiffusionSchedulers -from ...utils import ( +from ....image_processor import VaeImageProcessor +from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, UNet2DConditionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import DDIMInverseScheduler, KarrasDiffusionSchedulers +from ....utils import ( PIL_INTERPOLATION, USE_PEFT_BACKEND, BaseOutput, @@ -39,7 +39,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/stable_diffusion_gligen/__init__.py b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/__init__.py similarity index 89% rename from src/diffusers/pipelines/stable_diffusion_gligen/__init__.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_gligen/__init__.py index 147980cbf9e5..81c8b8b99cd8 100644 --- a/src/diffusers/pipelines/stable_diffusion_gligen/__init__.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -31,7 +31,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_stable_diffusion_gligen import StableDiffusionGLIGENPipeline from .pipeline_stable_diffusion_gligen_text_image import StableDiffusionGLIGENTextImagePipeline diff --git a/src/diffusers/pipelines/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py index 4bbb93e44a83..a7d64a579c4f 100644 --- a/src/diffusers/pipelines/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py @@ -20,13 +20,13 @@ import torch from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer -from ...image_processor import VaeImageProcessor -from ...loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, UNet2DConditionModel -from ...models.attention import GatedSelfAttentionDense -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....image_processor import VaeImageProcessor +from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, UNet2DConditionModel +from ....models.attention import GatedSelfAttentionDense +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, deprecate, is_torch_xla_available, @@ -35,7 +35,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py index 86ef01784057..5423d6bca903 100644 --- a/src/diffusers/pipelines/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py @@ -26,13 +26,13 @@ CLIPVisionModelWithProjection, ) -from ...image_processor import VaeImageProcessor -from ...loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, UNet2DConditionModel -from ...models.attention import GatedSelfAttentionDense -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....image_processor import VaeImageProcessor +from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, UNet2DConditionModel +from ....models.attention import GatedSelfAttentionDense +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, is_torch_xla_available, logging, @@ -40,7 +40,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.clip_image_project_model import CLIPImageProjection diff --git a/src/diffusers/pipelines/stable_diffusion_k_diffusion/__init__.py b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/__init__.py similarity index 89% rename from src/diffusers/pipelines/stable_diffusion_k_diffusion/__init__.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/__init__.py index 7eb5bf8c229b..459757a14ba5 100644 --- a/src/diffusers/pipelines/stable_diffusion_k_diffusion/__init__.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -25,7 +25,7 @@ ): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_and_k_diffusion_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_and_k_diffusion_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_and_k_diffusion_objects)) else: @@ -43,7 +43,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_and_k_diffusion_objects import * + from ....utils.dummy_torch_and_transformers_and_k_diffusion_objects import * else: from .pipeline_stable_diffusion_k_diffusion import StableDiffusionKDiffusionPipeline from .pipeline_stable_diffusion_xl_k_diffusion import StableDiffusionXLKDiffusionPipeline diff --git a/src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py similarity index 98% rename from src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py index 1f29f577f8e0..fd9052317d87 100755 --- a/src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py @@ -26,22 +26,22 @@ CLIPTokenizerFast, ) -from ...image_processor import VaeImageProcessor -from ...loaders import ( +from ....image_processor import VaeImageProcessor +from ....loaders import ( StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin, ) -from ...models import AutoencoderKL, UNet2DConditionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers, LMSDiscreteScheduler -from ...utils import ( +from ....models import AutoencoderKL, UNet2DConditionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers, LMSDiscreteScheduler +from ....utils import ( USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput, StableDiffusionSafetyChecker @@ -122,6 +122,8 @@ def __init__( ): super().__init__() + logger.warning(f"{self.__class__.__name__} is deprecated and will no longer be actively maintained") + logger.info( f"{self.__class__} is an experimntal pipeline and is likely to change in the future. We recommend to use" " this pipeline for fast experimentation / iteration if needed, but advice to rely on existing pipelines" diff --git a/src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py similarity index 98% rename from src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py index c7c5bd9cff67..776ed5bddb6b 100644 --- a/src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py @@ -25,29 +25,29 @@ CLIPTokenizer, ) -from ...image_processor import VaeImageProcessor -from ...loaders import ( +from ....image_processor import VaeImageProcessor +from ....loaders import ( FromSingleFileMixin, IPAdapterMixin, StableDiffusionXLLoraLoaderMixin, TextualInversionLoaderMixin, ) -from ...models import AutoencoderKL, UNet2DConditionModel -from ...models.attention_processor import ( +from ....models import AutoencoderKL, UNet2DConditionModel +from ....models.attention_processor import ( AttnProcessor2_0, FusedAttnProcessor2_0, XFormersAttnProcessor, ) -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers, LMSDiscreteScheduler -from ...utils import ( +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers, LMSDiscreteScheduler +from ....utils import ( USE_PEFT_BACKEND, logging, replace_example_docstring, scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput @@ -158,6 +158,8 @@ def __init__( ): super().__init__() + logger.warning(f"{self.__class__.__name__} is deprecated and will no longer be actively maintained") + # get correct sigmas from LMS scheduler = LMSDiscreteScheduler.from_config(scheduler.config) self.register_modules( diff --git a/src/diffusers/pipelines/stable_diffusion_ldm3d/__init__.py b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/__init__.py similarity index 87% rename from src/diffusers/pipelines/stable_diffusion_ldm3d/__init__.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/__init__.py index dae2affddd1f..a2fcf3ab8369 100644 --- a/src/diffusers/pipelines/stable_diffusion_ldm3d/__init__.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -30,7 +30,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_stable_diffusion_ldm3d import StableDiffusionLDM3DPipeline diff --git a/src/diffusers/pipelines/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py index 702f3eda5816..578523309ae4 100644 --- a/src/diffusers/pipelines/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py @@ -21,12 +21,12 @@ import torch from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection -from ...image_processor import PipelineImageInput, VaeImageProcessorLDM3D -from ...loaders import FromSingleFileMixin, IPAdapterMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, ImageProjection, UNet2DConditionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....image_processor import PipelineImageInput, VaeImageProcessorLDM3D +from ....loaders import FromSingleFileMixin, IPAdapterMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, ImageProjection, UNet2DConditionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, BaseOutput, deprecate, @@ -36,7 +36,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/stable_diffusion_panorama/__init__.py b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/__init__.py similarity index 87% rename from src/diffusers/pipelines/stable_diffusion_panorama/__init__.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_panorama/__init__.py index f7572db7236c..ce0601ed2649 100644 --- a/src/diffusers/pipelines/stable_diffusion_panorama/__init__.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -30,7 +30,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_stable_diffusion_panorama import StableDiffusionPanoramaPipeline diff --git a/src/diffusers/pipelines/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py index ccee6d47b47a..e09433f308db 100644 --- a/src/diffusers/pipelines/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py @@ -18,12 +18,12 @@ import torch from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection -from ...image_processor import PipelineImageInput, VaeImageProcessor -from ...loaders import IPAdapterMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, ImageProjection, UNet2DConditionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import DDIMScheduler -from ...utils import ( +from ....image_processor import PipelineImageInput, VaeImageProcessor +from ....loaders import IPAdapterMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, ImageProjection, UNet2DConditionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import DDIMScheduler +from ....utils import ( USE_PEFT_BACKEND, deprecate, is_torch_xla_available, @@ -32,7 +32,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/stable_diffusion_safe/__init__.py b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/__init__.py similarity index 94% rename from src/diffusers/pipelines/stable_diffusion_safe/__init__.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_safe/__init__.py index b432b9418c46..bf7e47744bad 100644 --- a/src/diffusers/pipelines/stable_diffusion_safe/__init__.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/__init__.py @@ -6,7 +6,7 @@ import PIL from PIL import Image -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, BaseOutput, OptionalDependencyNotAvailable, @@ -59,7 +59,7 @@ class SafetyConfig(object): if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects + from ....utils import dummy_torch_and_transformers_objects _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -77,7 +77,7 @@ class SafetyConfig(object): if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_output import StableDiffusionSafePipelineOutput from .pipeline_stable_diffusion_safe import StableDiffusionPipelineSafe diff --git a/src/diffusers/pipelines/stable_diffusion_safe/pipeline_output.py b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_output.py similarity index 98% rename from src/diffusers/pipelines/stable_diffusion_safe/pipeline_output.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_output.py index 69a064d6638d..3dcea8c9f449 100644 --- a/src/diffusers/pipelines/stable_diffusion_safe/pipeline_output.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_output.py @@ -4,7 +4,7 @@ import numpy as np import PIL.Image -from ...utils import ( +from ....utils import ( BaseOutput, ) diff --git a/src/diffusers/pipelines/stable_diffusion_safe/pipeline_stable_diffusion_safe.py b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_safe/pipeline_stable_diffusion_safe.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py index deae82eb8813..837670b88c22 100644 --- a/src/diffusers/pipelines/stable_diffusion_safe/pipeline_stable_diffusion_safe.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py @@ -8,12 +8,12 @@ from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection from ...configuration_utils import FrozenDict -from ...image_processor import PipelineImageInput -from ...loaders import IPAdapterMixin -from ...models import AutoencoderKL, ImageProjection, UNet2DConditionModel -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import deprecate, is_torch_xla_available, logging -from ...utils.torch_utils import randn_tensor +from ....image_processor import PipelineImageInput +from ....loaders import IPAdapterMixin +from ....models import AutoencoderKL, ImageProjection, UNet2DConditionModel +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import deprecate, is_torch_xla_available, logging +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from . import StableDiffusionSafePipelineOutput from .safety_checker import SafeStableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/stable_diffusion_safe/safety_checker.py b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/safety_checker.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_safe/safety_checker.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_safe/safety_checker.py index 338e4c65c500..76182ecd9644 100644 --- a/src/diffusers/pipelines/stable_diffusion_safe/safety_checker.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/safety_checker.py @@ -16,7 +16,7 @@ import torch.nn as nn from transformers import CLIPConfig, CLIPVisionModel, PreTrainedModel -from ...utils import logging +from ....utils import logging logger = logging.get_logger(__name__) diff --git a/src/diffusers/pipelines/stable_diffusion_sag/__init__.py b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/__init__.py similarity index 87% rename from src/diffusers/pipelines/stable_diffusion_sag/__init__.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_sag/__init__.py index 378e0e57817f..8cdd1ec6bdf0 100644 --- a/src/diffusers/pipelines/stable_diffusion_sag/__init__.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -18,7 +18,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -30,7 +30,7 @@ raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * + from ....utils.dummy_torch_and_transformers_objects import * else: from .pipeline_stable_diffusion_sag import StableDiffusionSAGPipeline diff --git a/src/diffusers/pipelines/stable_diffusion_sag/pipeline_stable_diffusion_sag.py b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion_sag/pipeline_stable_diffusion_sag.py rename to src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py index e96422073b19..07986bc709f3 100644 --- a/src/diffusers/pipelines/stable_diffusion_sag/pipeline_stable_diffusion_sag.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py @@ -19,12 +19,12 @@ import torch.nn.functional as F from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection -from ...image_processor import PipelineImageInput, VaeImageProcessor -from ...loaders import IPAdapterMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, ImageProjection, UNet2DConditionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....image_processor import PipelineImageInput, VaeImageProcessor +from ....loaders import IPAdapterMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, ImageProjection, UNet2DConditionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, deprecate, is_torch_xla_available, @@ -33,7 +33,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py index 1752540e8f79..9193932841c1 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py @@ -29,9 +29,9 @@ from ....schedulers import DDIMScheduler from ....utils import PIL_INTERPOLATION, USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor -from ...pipeline_utils import DiffusionPipeline -from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ..pipeline_utils import DiffusionPipeline +from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py index e9553a8d99b0..f19f914425ca 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py @@ -10,8 +10,8 @@ from ....schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler from ....utils import deprecate, logging from ...onnx_utils import ORT_TO_NP_TYPE, OnnxRuntimeModel -from ...pipeline_utils import DiffusionPipeline -from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ..pipeline_utils import DiffusionPipeline +from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py index f9c9c37c4867..3d087cf20fe3 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py @@ -29,9 +29,9 @@ from ....schedulers import KarrasDiffusionSchedulers from ....utils import PIL_INTERPOLATION, USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor -from ...pipeline_utils import DiffusionPipeline -from ...stable_diffusion import StableDiffusionPipelineOutput -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ..pipeline_utils import DiffusionPipeline +from ..stable_diffusion import StableDiffusionPipelineOutput +from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py index 06db871daf62..125a0c633846 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py @@ -26,9 +26,9 @@ from ....schedulers.scheduling_utils import SchedulerMixin from ....utils import USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor -from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py index d486a32f6a4c..98d78d2909c9 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py @@ -32,9 +32,9 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py index 509f25620950..b635211e92be 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py @@ -46,9 +46,9 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/text_to_video_synthesis/__init__.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/__init__.py similarity index 90% rename from src/diffusers/pipelines/text_to_video_synthesis/__init__.py rename to src/diffusers/pipelines/deprecated/text_to_video_synthesis/__init__.py index 8d8fdb92769b..6c32f5f16cae 100644 --- a/src/diffusers/pipelines/text_to_video_synthesis/__init__.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -17,7 +17,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects # noqa F403 + from ....utils import dummy_torch_and_transformers_objects # noqa F403 _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -33,7 +33,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * # noqa F403 + from ....utils.dummy_torch_and_transformers_objects import * # noqa F403 else: from .pipeline_output import TextToVideoSDPipelineOutput from .pipeline_text_to_video_synth import TextToVideoSDPipeline diff --git a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_output.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_output.py similarity index 96% rename from src/diffusers/pipelines/text_to_video_synthesis/pipeline_output.py rename to src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_output.py index 040bf0efba84..e223bcebf9b2 100644 --- a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_output.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_output.py @@ -5,7 +5,7 @@ import PIL import torch -from ...utils import ( +from ....utils import ( BaseOutput, ) diff --git a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_synth.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py similarity index 98% rename from src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_synth.py rename to src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py index 5c63d66e3133..379c1ca8c677 100644 --- a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_synth.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py @@ -18,11 +18,11 @@ import torch from transformers import CLIPTextModel, CLIPTokenizer -from ...loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, UNet3DConditionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, UNet3DConditionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, deprecate, is_torch_xla_available, @@ -31,8 +31,8 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor -from ...video_processor import VideoProcessor +from ....utils.torch_utils import randn_tensor +from ....video_processor import VideoProcessor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from . import TextToVideoSDPipelineOutput diff --git a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py similarity index 98% rename from src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py rename to src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py index 006c7a79ce0d..63ba18e476d2 100644 --- a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py @@ -19,11 +19,11 @@ import torch from transformers import CLIPTextModel, CLIPTokenizer -from ...loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, UNet3DConditionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, UNet3DConditionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, deprecate, is_torch_xla_available, @@ -32,8 +32,8 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor -from ...video_processor import VideoProcessor +from ....utils.torch_utils import randn_tensor +from ....video_processor import VideoProcessor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from . import TextToVideoSDPipelineOutput diff --git a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_zero.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py similarity index 99% rename from src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_zero.py rename to src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py index df85f470a80b..6a67f4c480ba 100644 --- a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_zero.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py @@ -10,12 +10,12 @@ from torch.nn.functional import grid_sample from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer -from ...image_processor import VaeImageProcessor -from ...loaders import FromSingleFileMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, UNet2DConditionModel -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....image_processor import VaeImageProcessor +from ....loaders import FromSingleFileMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, UNet2DConditionModel +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, BaseOutput, is_torch_xla_available, @@ -23,7 +23,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py similarity index 99% rename from src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py rename to src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py index 339d5b3a6019..5581f80d3514 100644 --- a/src/diffusers/pipelines/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py @@ -16,17 +16,17 @@ CLIPVisionModelWithProjection, ) -from ...image_processor import VaeImageProcessor -from ...loaders import StableDiffusionXLLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL, UNet2DConditionModel -from ...models.attention_processor import ( +from ....image_processor import VaeImageProcessor +from ....loaders import StableDiffusionXLLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL, UNet2DConditionModel +from ....models.attention_processor import ( AttnProcessor2_0, FusedAttnProcessor2_0, XFormersAttnProcessor, ) -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, BaseOutput, is_invisible_watermark_available, @@ -34,7 +34,7 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin @@ -42,7 +42,7 @@ from ..stable_diffusion_xl.watermark import StableDiffusionXLWatermarker -from ...utils import is_torch_xla_available +from ....utils import is_torch_xla_available if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/unclip/__init__.py b/src/diffusers/pipelines/deprecated/unclip/__init__.py similarity index 87% rename from src/diffusers/pipelines/unclip/__init__.py rename to src/diffusers/pipelines/deprecated/unclip/__init__.py index c89e899463be..7444df491273 100644 --- a/src/diffusers/pipelines/unclip/__init__.py +++ b/src/diffusers/pipelines/deprecated/unclip/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -17,7 +17,7 @@ if not (is_transformers_available() and is_torch_available() and is_transformers_version(">=", "4.25.0")): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import UnCLIPImageVariationPipeline, UnCLIPPipeline + from ....utils.dummy_torch_and_transformers_objects import UnCLIPImageVariationPipeline, UnCLIPPipeline _dummy_objects.update( {"UnCLIPImageVariationPipeline": UnCLIPImageVariationPipeline, "UnCLIPPipeline": UnCLIPPipeline} @@ -33,7 +33,7 @@ if not (is_transformers_available() and is_torch_available() and is_transformers_version(">=", "4.25.0")): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * # noqa F403 + from ....utils.dummy_torch_and_transformers_objects import * # noqa F403 else: from .pipeline_unclip import UnCLIPPipeline from .pipeline_unclip_image_variation import UnCLIPImageVariationPipeline diff --git a/src/diffusers/pipelines/unclip/pipeline_unclip.py b/src/diffusers/pipelines/deprecated/unclip/pipeline_unclip.py similarity index 98% rename from src/diffusers/pipelines/unclip/pipeline_unclip.py rename to src/diffusers/pipelines/deprecated/unclip/pipeline_unclip.py index bf42d44f74c1..c5f84291f4ef 100644 --- a/src/diffusers/pipelines/unclip/pipeline_unclip.py +++ b/src/diffusers/pipelines/deprecated/unclip/pipeline_unclip.py @@ -20,11 +20,11 @@ from transformers import CLIPTextModelWithProjection, CLIPTokenizer from transformers.models.clip.modeling_clip import CLIPTextModelOutput -from ...models import PriorTransformer, UNet2DConditionModel, UNet2DModel -from ...schedulers import UnCLIPScheduler -from ...utils import is_torch_xla_available, logging -from ...utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput +from ....models import PriorTransformer, UNet2DConditionModel, UNet2DModel +from ....schedulers import UnCLIPScheduler +from ....utils import is_torch_xla_available, logging +from ....utils.torch_utils import randn_tensor +from ...pipeline_utils import DiffusionPipeline, ImagePipelineOutput from .text_proj import UnCLIPTextProjModel diff --git a/src/diffusers/pipelines/unclip/pipeline_unclip_image_variation.py b/src/diffusers/pipelines/deprecated/unclip/pipeline_unclip_image_variation.py similarity index 98% rename from src/diffusers/pipelines/unclip/pipeline_unclip_image_variation.py rename to src/diffusers/pipelines/deprecated/unclip/pipeline_unclip_image_variation.py index 8fa0a848f7e7..1e1787362ec2 100644 --- a/src/diffusers/pipelines/unclip/pipeline_unclip_image_variation.py +++ b/src/diffusers/pipelines/deprecated/unclip/pipeline_unclip_image_variation.py @@ -25,11 +25,11 @@ CLIPVisionModelWithProjection, ) -from ...models import UNet2DConditionModel, UNet2DModel -from ...schedulers import UnCLIPScheduler -from ...utils import is_torch_xla_available, logging -from ...utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput +from ....models import UNet2DConditionModel, UNet2DModel +from ....schedulers import UnCLIPScheduler +from ....utils import is_torch_xla_available, logging +from ....utils.torch_utils import randn_tensor +from ...pipeline_utils import DiffusionPipeline, ImagePipelineOutput from .text_proj import UnCLIPTextProjModel diff --git a/src/diffusers/pipelines/unclip/text_proj.py b/src/diffusers/pipelines/deprecated/unclip/text_proj.py similarity index 100% rename from src/diffusers/pipelines/unclip/text_proj.py rename to src/diffusers/pipelines/deprecated/unclip/text_proj.py diff --git a/src/diffusers/pipelines/unidiffuser/__init__.py b/src/diffusers/pipelines/deprecated/unidiffuser/__init__.py similarity index 91% rename from src/diffusers/pipelines/unidiffuser/__init__.py rename to src/diffusers/pipelines/deprecated/unidiffuser/__init__.py index 1ac2b09a6e57..aeaba167dc11 100644 --- a/src/diffusers/pipelines/unidiffuser/__init__.py +++ b/src/diffusers/pipelines/deprecated/unidiffuser/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -16,7 +16,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import ( + from ....utils.dummy_torch_and_transformers_objects import ( ImageTextPipelineOutput, UniDiffuserPipeline, ) @@ -35,7 +35,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import ( + from ....utils.dummy_torch_and_transformers_objects import ( ImageTextPipelineOutput, UniDiffuserPipeline, ) diff --git a/src/diffusers/pipelines/unidiffuser/modeling_text_decoder.py b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_text_decoder.py similarity index 100% rename from src/diffusers/pipelines/unidiffuser/modeling_text_decoder.py rename to src/diffusers/pipelines/deprecated/unidiffuser/modeling_text_decoder.py diff --git a/src/diffusers/pipelines/unidiffuser/modeling_uvit.py b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py similarity index 99% rename from src/diffusers/pipelines/unidiffuser/modeling_uvit.py rename to src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py index 1e285a9670e2..0b3175e2f2bb 100644 --- a/src/diffusers/pipelines/unidiffuser/modeling_uvit.py +++ b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py @@ -11,7 +11,7 @@ from ...models.embeddings import TimestepEmbedding, Timesteps, get_2d_sincos_pos_embed from ...models.modeling_outputs import Transformer2DModelOutput from ...models.normalization import AdaLayerNorm -from ...utils import logging +from ....utils import logging logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/unidiffuser/pipeline_unidiffuser.py b/src/diffusers/pipelines/deprecated/unidiffuser/pipeline_unidiffuser.py similarity index 98% rename from src/diffusers/pipelines/unidiffuser/pipeline_unidiffuser.py rename to src/diffusers/pipelines/deprecated/unidiffuser/pipeline_unidiffuser.py index 66d7404fb9a5..40d30e94423b 100644 --- a/src/diffusers/pipelines/unidiffuser/pipeline_unidiffuser.py +++ b/src/diffusers/pipelines/deprecated/unidiffuser/pipeline_unidiffuser.py @@ -13,12 +13,12 @@ GPT2Tokenizer, ) -from ...image_processor import VaeImageProcessor -from ...loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin -from ...models import AutoencoderKL -from ...models.lora import adjust_lora_scale_text_encoder -from ...schedulers import KarrasDiffusionSchedulers -from ...utils import ( +from ....image_processor import VaeImageProcessor +from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....models import AutoencoderKL +from ....models.lora import adjust_lora_scale_text_encoder +from ....schedulers import KarrasDiffusionSchedulers +from ....utils import ( USE_PEFT_BACKEND, deprecate, is_torch_xla_available, @@ -26,8 +26,8 @@ scale_lora_layers, unscale_lora_layers, ) -from ...utils.outputs import BaseOutput -from ...utils.torch_utils import randn_tensor +from ....utils.outputs import BaseOutput +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline from .modeling_text_decoder import UniDiffuserTextDecoder from .modeling_uvit import UniDiffuserModel @@ -225,7 +225,7 @@ def _infer_mode(self, prompt, prompt_embeds, image, latents, prompt_latents, vae return mode - # Copied from diffusers.pipelines.pipeline_utils.StableDiffusionMixin.enable_vae_slicing + # Copied from ..pipeline_utils.StableDiffusionMixin.enable_vae_slicing def enable_vae_slicing(self): r""" Enable sliced VAE decoding. When this option is enabled, the VAE will split the input tensor in slices to @@ -233,7 +233,7 @@ def enable_vae_slicing(self): """ self.vae.enable_slicing() - # Copied from diffusers.pipelines.pipeline_utils.StableDiffusionMixin.disable_vae_slicing + # Copied from ..pipeline_utils.StableDiffusionMixin.disable_vae_slicing def disable_vae_slicing(self): r""" Disable sliced VAE decoding. If `enable_vae_slicing` was previously enabled, this method will go back to @@ -241,7 +241,7 @@ def disable_vae_slicing(self): """ self.vae.disable_slicing() - # Copied from diffusers.pipelines.pipeline_utils.StableDiffusionMixin.enable_vae_tiling + # Copied from ..pipeline_utils.StableDiffusionMixin.enable_vae_tiling def enable_vae_tiling(self): r""" Enable tiled VAE decoding. When this option is enabled, the VAE will split the input tensor into tiles to @@ -250,7 +250,7 @@ def enable_vae_tiling(self): """ self.vae.enable_tiling() - # Copied from diffusers.pipelines.pipeline_utils.StableDiffusionMixin.disable_vae_tiling + # Copied from ..pipeline_utils.StableDiffusionMixin.disable_vae_tiling def disable_vae_tiling(self): r""" Disable tiled VAE decoding. If `enable_vae_tiling` was previously enabled, this method will go back to diff --git a/src/diffusers/pipelines/deprecated/versatile_diffusion/pipeline_versatile_diffusion.py b/src/diffusers/pipelines/deprecated/versatile_diffusion/pipeline_versatile_diffusion.py index 4fb437958abd..126dddd253ab 100644 --- a/src/diffusers/pipelines/deprecated/versatile_diffusion/pipeline_versatile_diffusion.py +++ b/src/diffusers/pipelines/deprecated/versatile_diffusion/pipeline_versatile_diffusion.py @@ -8,7 +8,7 @@ from ....models import AutoencoderKL, UNet2DConditionModel from ....schedulers import KarrasDiffusionSchedulers from ....utils import logging -from ...pipeline_utils import DiffusionPipeline +from ..pipeline_utils import DiffusionPipeline from .pipeline_versatile_diffusion_dual_guided import VersatileDiffusionDualGuidedPipeline from .pipeline_versatile_diffusion_image_variation import VersatileDiffusionImageVariationPipeline from .pipeline_versatile_diffusion_text_to_image import VersatileDiffusionTextToImagePipeline diff --git a/src/diffusers/pipelines/wuerstchen/__init__.py b/src/diffusers/pipelines/deprecated/wuerstchen/__init__.py similarity index 91% rename from src/diffusers/pipelines/wuerstchen/__init__.py rename to src/diffusers/pipelines/deprecated/wuerstchen/__init__.py index ddb852d19315..26f259512cbd 100644 --- a/src/diffusers/pipelines/wuerstchen/__init__.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/__init__.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from ...utils import ( +from ....utils import ( DIFFUSERS_SLOW_IMPORT, OptionalDependencyNotAvailable, _LazyModule, @@ -17,7 +17,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils import dummy_torch_and_transformers_objects + from ....utils import dummy_torch_and_transformers_objects _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: @@ -34,7 +34,7 @@ if not (is_transformers_available() and is_torch_available()): raise OptionalDependencyNotAvailable() except OptionalDependencyNotAvailable: - from ...utils.dummy_torch_and_transformers_objects import * # noqa F403 + from ....utils.dummy_torch_and_transformers_objects import * # noqa F403 else: from .modeling_paella_vq_model import PaellaVQModel from .modeling_wuerstchen_diffnext import WuerstchenDiffNeXt diff --git a/src/diffusers/pipelines/wuerstchen/modeling_paella_vq_model.py b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_paella_vq_model.py similarity index 99% rename from src/diffusers/pipelines/wuerstchen/modeling_paella_vq_model.py rename to src/diffusers/pipelines/deprecated/wuerstchen/modeling_paella_vq_model.py index b2cf8cbc978c..ab8d259dc1c5 100644 --- a/src/diffusers/pipelines/wuerstchen/modeling_paella_vq_model.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_paella_vq_model.py @@ -22,7 +22,7 @@ from ...models.autoencoders.vae import DecoderOutput, VectorQuantizer from ...models.modeling_utils import ModelMixin from ...models.vq_model import VQEncoderOutput -from ...utils.accelerate_utils import apply_forward_hook +from ....utils.accelerate_utils import apply_forward_hook class MixingResidualBlock(nn.Module): diff --git a/src/diffusers/pipelines/wuerstchen/modeling_wuerstchen_common.py b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_common.py similarity index 100% rename from src/diffusers/pipelines/wuerstchen/modeling_wuerstchen_common.py rename to src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_common.py diff --git a/src/diffusers/pipelines/wuerstchen/modeling_wuerstchen_diffnext.py b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_diffnext.py similarity index 100% rename from src/diffusers/pipelines/wuerstchen/modeling_wuerstchen_diffnext.py rename to src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_diffnext.py diff --git a/src/diffusers/pipelines/wuerstchen/modeling_wuerstchen_prior.py b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_prior.py similarity index 100% rename from src/diffusers/pipelines/wuerstchen/modeling_wuerstchen_prior.py rename to src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_prior.py diff --git a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen.py b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen.py similarity index 98% rename from src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen.py rename to src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen.py index edc01f0d5c75..43861bb9b697 100644 --- a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen.py @@ -18,10 +18,10 @@ import torch from transformers import CLIPTextModel, CLIPTokenizer -from ...schedulers import DDPMWuerstchenScheduler -from ...utils import deprecate, is_torch_xla_available, logging, replace_example_docstring -from ...utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput +from ....schedulers import DDPMWuerstchenScheduler +from ....utils import deprecate, is_torch_xla_available, logging, replace_example_docstring +from ....utils.torch_utils import randn_tensor +from ...pipeline_utils import DiffusionPipeline, ImagePipelineOutput from .modeling_paella_vq_model import PaellaVQModel from .modeling_wuerstchen_diffnext import WuerstchenDiffNeXt diff --git a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_combined.py b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_combined.py similarity index 99% rename from src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_combined.py rename to src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_combined.py index 7819c8c0a0ef..4d1bc7abf581 100644 --- a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_combined.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_combined.py @@ -16,8 +16,8 @@ import torch from transformers import CLIPTextModel, CLIPTokenizer -from ...schedulers import DDPMWuerstchenScheduler -from ...utils import deprecate, replace_example_docstring +from ....schedulers import DDPMWuerstchenScheduler +from ....utils import deprecate, replace_example_docstring from ..pipeline_utils import DiffusionPipeline from .modeling_paella_vq_model import PaellaVQModel from .modeling_wuerstchen_diffnext import WuerstchenDiffNeXt diff --git a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_prior.py b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py similarity index 98% rename from src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_prior.py rename to src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py index 8f6ba419721d..7cef8a3be0f7 100644 --- a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_prior.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py @@ -20,10 +20,10 @@ import torch from transformers import CLIPTextModel, CLIPTokenizer -from ...loaders import StableDiffusionLoraLoaderMixin -from ...schedulers import DDPMWuerstchenScheduler -from ...utils import BaseOutput, deprecate, is_torch_xla_available, logging, replace_example_docstring -from ...utils.torch_utils import randn_tensor +from ....loaders import StableDiffusionLoraLoaderMixin +from ....schedulers import DDPMWuerstchenScheduler +from ....utils import BaseOutput, deprecate, is_torch_xla_available, logging, replace_example_docstring +from ....utils.torch_utils import randn_tensor from ..pipeline_utils import DiffusionPipeline from .modeling_wuerstchen_prior import WuerstchenPrior From b797186e8487432028b2cc874eafcbdc33c10b3f Mon Sep 17 00:00:00 2001 From: DN6 Date: Thu, 17 Apr 2025 00:39:19 +0530 Subject: [PATCH 02/32] update --- .../pipelines/deprecated/__init__.py | 22 ++++++++++--------- .../alt_diffusion/pipeline_alt_diffusion.py | 2 +- .../pipeline_alt_diffusion_img2img.py | 2 +- .../pipeline_audio_diffusion.py | 2 +- .../deprecated/audioldm/pipeline_audioldm.py | 6 ++--- .../pipeline_dance_diffusion.py | 2 +- .../i2vgen_xl/pipeline_i2vgen_xl.py | 2 +- .../deprecated/latte/pipeline_latte.py | 2 +- .../deprecated/musicldm/pipeline_musicldm.py | 2 +- .../paint_by_example/image_encoder.py | 2 +- .../pipeline_paint_by_example.py | 2 +- .../pipelines/deprecated/pia/pipeline_pia.py | 3 ++- .../pipeline_semantic_stable_diffusion.py | 4 ++-- .../deprecated/shap_e/pipeline_shap_e.py | 2 +- .../shap_e/pipeline_shap_e_img2img.py | 2 +- .../pipelines/deprecated/shap_e/renderer.py | 2 +- .../pipeline_spectrogram_diffusion.py | 2 +- ...line_stable_diffusion_attend_and_excite.py | 2 +- .../pipeline_stable_diffusion_diffedit.py | 4 ++-- .../pipeline_stable_diffusion_gligen.py | 2 +- ...line_stable_diffusion_gligen_text_image.py | 2 +- .../pipeline_stable_diffusion_k_diffusion.py | 2 +- ...ipeline_stable_diffusion_xl_k_diffusion.py | 2 +- .../pipeline_stable_diffusion_ldm3d.py | 9 ++++++-- .../pipeline_stable_diffusion_panorama.py | 2 +- .../pipeline_stable_diffusion_safe.py | 4 ++-- .../pipeline_stable_diffusion_sag.py | 2 +- .../pipeline_cycle_diffusion.py | 2 +- ...ne_onnx_stable_diffusion_inpaint_legacy.py | 2 +- ...ipeline_stable_diffusion_inpaint_legacy.py | 2 +- ...pipeline_stable_diffusion_model_editing.py | 2 +- .../pipeline_stable_diffusion_paradigms.py | 2 +- .../pipeline_stable_diffusion_pix2pix_zero.py | 2 +- .../pipeline_text_to_video_synth.py | 2 +- .../pipeline_text_to_video_synth_img2img.py | 2 +- .../pipeline_text_to_video_zero.py | 2 +- .../pipeline_text_to_video_zero_sdxl.py | 2 +- .../deprecated/unidiffuser/modeling_uvit.py | 2 +- .../unidiffuser/pipeline_unidiffuser.py | 10 ++++----- .../pipeline_versatile_diffusion.py | 2 +- .../wuerstchen/modeling_paella_vq_model.py | 8 +++---- .../wuerstchen/modeling_wuerstchen_common.py | 2 +- .../modeling_wuerstchen_diffnext.py | 4 ++-- .../wuerstchen/modeling_wuerstchen_prior.py | 8 +++---- .../pipeline_wuerstchen_combined.py | 2 +- .../wuerstchen/pipeline_wuerstchen_prior.py | 2 +- 46 files changed, 79 insertions(+), 73 deletions(-) diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index 6464752f5b5b..84cbd55dc1c2 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -1,8 +1,8 @@ -from typing import TYPE_CHECKING import functools import inspect -import warnings import sys +import warnings +from typing import TYPE_CHECKING from ...utils import ( DIFFUSERS_SLOW_IMPORT, @@ -13,24 +13,26 @@ is_note_seq_available, is_torch_available, is_transformers_available, + logging, ) +logger = logging.get_logger(__name__) + + # Custom Lazy Module for deprecated pipelines that shows a warning class _DeprecatedLazyModule(_LazyModule): """ - Module class that surfaces all objects but only performs associated imports when the objects are requested, - and shows deprecation warnings when any of its attributes are accessed. + Module class that surfaces all objects but only performs associated imports when the objects are requested, and + shows deprecation warnings when any of its attributes are accessed. """ def __getattr__(self, name): # Regular attribute access - first check if it's supposed to be loaded if name in self._modules or name in self._class_to_module: # Only warn for actual pipeline components, not utility functions - warnings.warn( - f"{name} is deprecated and will no longer be maintained.", - FutureWarning, - stacklevel=2, + logger.warning( + f"{name} is deprecated and will no longer be maintained or receive future updates.", ) # Use the standard lazy module behavior to load the attribute @@ -184,7 +186,7 @@ def __getattr__(self, name): from .paint_by_example import PaintByExamplePipeline from .pia import PIAPipeline from .semantic_stable_diffusion import SemanticStableDiffusionPipeline - from .shap_e import ShapEPipeline, ShapEImg2ImgPipeline + from .shap_e import ShapEImg2ImgPipeline, ShapEPipeline from .stable_diffusion_attend_and_excite import StableDiffusionAttendAndExcitePipeline from .stable_diffusion_diffedit import StableDiffusionDiffEditPipeline from .stable_diffusion_gligen import StableDiffusionGLIGENPipeline, StableDiffusionGLIGENTextImagePipeline @@ -208,7 +210,7 @@ def __getattr__(self, name): TextToVideoZeroPipeline, TextToVideoZeroSDXLPipeline, ) - from .unclip import UnCLIPPipeline, UnCLIPImageVariationPipeline + from .unclip import UnCLIPImageVariationPipeline, UnCLIPPipeline from .unidiffuser import UniDiffuserPipeline from .versatile_diffusion import ( VersatileDiffusionDualGuidedPipeline, diff --git a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py index 6fc9e1ec397c..4dce54808d42 100644 --- a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py +++ b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py @@ -39,7 +39,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .modeling_roberta_series import RobertaSeriesModelWithTransformation from .pipeline_output import AltDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py index 563c81d1cea2..7538ab009856 100644 --- a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py +++ b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py @@ -42,7 +42,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .modeling_roberta_series import RobertaSeriesModelWithTransformation from .pipeline_output import AltDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/audio_diffusion/pipeline_audio_diffusion.py b/src/diffusers/pipelines/deprecated/audio_diffusion/pipeline_audio_diffusion.py index 663e474344bc..47044e050acf 100644 --- a/src/diffusers/pipelines/deprecated/audio_diffusion/pipeline_audio_diffusion.py +++ b/src/diffusers/pipelines/deprecated/audio_diffusion/pipeline_audio_diffusion.py @@ -23,7 +23,7 @@ from ....models import AutoencoderKL, UNet2DConditionModel from ....schedulers import DDIMScheduler, DDPMScheduler from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import AudioPipelineOutput, BaseOutput, DiffusionPipeline, ImagePipelineOutput +from ...pipeline_utils import AudioPipelineOutput, BaseOutput, DiffusionPipeline, ImagePipelineOutput from .mel import Mel diff --git a/src/diffusers/pipelines/deprecated/audioldm/pipeline_audioldm.py b/src/diffusers/pipelines/deprecated/audioldm/pipeline_audioldm.py index 307325e7e7e2..279b9925699b 100644 --- a/src/diffusers/pipelines/deprecated/audioldm/pipeline_audioldm.py +++ b/src/diffusers/pipelines/deprecated/audioldm/pipeline_audioldm.py @@ -24,7 +24,7 @@ from ....schedulers import KarrasDiffusionSchedulers from ....utils import is_torch_xla_available, logging, replace_example_docstring from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import AudioPipelineOutput, DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import AudioPipelineOutput, DiffusionPipeline, StableDiffusionMixin if is_torch_xla_available(): @@ -96,9 +96,7 @@ def __init__( logger.warning(f"{self.__class__.__name__} is deprecated and will no longer be actively maintained") - logger.warning( - f"{self.__class__.__name__} is deprecated and will no longer be actively maintained" - ) + logger.warning(f"{self.__class__.__name__} is deprecated and will no longer be actively maintained") self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/deprecated/dance_diffusion/pipeline_dance_diffusion.py b/src/diffusers/pipelines/deprecated/dance_diffusion/pipeline_dance_diffusion.py index 0075eb8b3143..aab0337ed513 100644 --- a/src/diffusers/pipelines/deprecated/dance_diffusion/pipeline_dance_diffusion.py +++ b/src/diffusers/pipelines/deprecated/dance_diffusion/pipeline_dance_diffusion.py @@ -21,7 +21,7 @@ from ....schedulers import SchedulerMixin from ....utils import is_torch_xla_available, logging from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import AudioPipelineOutput, DiffusionPipeline +from ...pipeline_utils import AudioPipelineOutput, DiffusionPipeline if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py b/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py index e34a4ea26f98..df8e6b195daf 100644 --- a/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py +++ b/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py @@ -33,7 +33,7 @@ ) from ....utils.torch_utils import randn_tensor from ....video_processor import VideoProcessor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py b/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py index dfc1022a0b1e..0117f0e7b663 100644 --- a/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py +++ b/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py @@ -25,7 +25,6 @@ from ....callbacks import MultiPipelineCallbacks, PipelineCallback from ....models import AutoencoderKL, LatteTransformer3DModel -from ...pipeline_utils import DiffusionPipeline from ....schedulers import KarrasDiffusionSchedulers from ....utils import ( BACKENDS_MAPPING, @@ -39,6 +38,7 @@ ) from ....utils.torch_utils import is_compiled_module, randn_tensor from ....video_processor import VideoProcessor +from ...pipeline_utils import DiffusionPipeline if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/musicldm/pipeline_musicldm.py b/src/diffusers/pipelines/deprecated/musicldm/pipeline_musicldm.py index b1753756fffa..e2d2dc4c337a 100644 --- a/src/diffusers/pipelines/deprecated/musicldm/pipeline_musicldm.py +++ b/src/diffusers/pipelines/deprecated/musicldm/pipeline_musicldm.py @@ -36,7 +36,7 @@ replace_example_docstring, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import AudioPipelineOutput, DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import AudioPipelineOutput, DiffusionPipeline, StableDiffusionMixin if is_librosa_available(): diff --git a/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py b/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py index 76482de4a2eb..30f0ea666e6f 100644 --- a/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py +++ b/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py @@ -15,8 +15,8 @@ from torch import nn from transformers import CLIPPreTrainedModel, CLIPVisionModel -from ...models.attention import BasicTransformerBlock from ....utils import logging +from ...models.attention import BasicTransformerBlock logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py b/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py index 8454948a04f7..223925f1cabe 100644 --- a/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py +++ b/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py @@ -25,7 +25,7 @@ from ....schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler from ....utils import deprecate, is_torch_xla_available, logging from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .image_encoder import PaintByExampleImageEncoder diff --git a/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py index 566c794b7839..6401829a8bc3 100644 --- a/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py +++ b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py @@ -50,8 +50,9 @@ ) from ....utils.torch_utils import randn_tensor from ....video_processor import VideoProcessor +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..free_init_utils import FreeInitMixin -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin + if is_torch_xla_available(): import torch_xla.core.xla_model as xm diff --git a/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py index 53f5c7301488..559639cdff6f 100644 --- a/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py +++ b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py @@ -7,11 +7,11 @@ from ....image_processor import VaeImageProcessor from ....models import AutoencoderKL, UNet2DConditionModel -from ...pipelines.stable_diffusion.safety_checker import StableDiffusionSafetyChecker from ....schedulers import KarrasDiffusionSchedulers from ....utils import deprecate, is_torch_xla_available, logging from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .pipeline_output import SemanticStableDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py index 6819107453e2..1018cefa8103 100644 --- a/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py +++ b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py @@ -30,7 +30,7 @@ replace_example_docstring, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from .renderer import ShapERenderer diff --git a/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py index 620bde9f01ef..3b3e1e84670f 100644 --- a/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py +++ b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py @@ -29,7 +29,7 @@ replace_example_docstring, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from .renderer import ShapERenderer diff --git a/src/diffusers/pipelines/deprecated/shap_e/renderer.py b/src/diffusers/pipelines/deprecated/shap_e/renderer.py index 2510fe870ae1..52b753440526 100644 --- a/src/diffusers/pipelines/deprecated/shap_e/renderer.py +++ b/src/diffusers/pipelines/deprecated/shap_e/renderer.py @@ -21,9 +21,9 @@ import torch.nn.functional as F from torch import nn +from ....utils import BaseOutput from ...configuration_utils import ConfigMixin, register_to_config from ...models import ModelMixin -from ....utils import BaseOutput from .camera import create_pan_cameras diff --git a/src/diffusers/pipelines/deprecated/spectrogram_diffusion/pipeline_spectrogram_diffusion.py b/src/diffusers/pipelines/deprecated/spectrogram_diffusion/pipeline_spectrogram_diffusion.py index 242add16f395..b8ac8e1416bf 100644 --- a/src/diffusers/pipelines/deprecated/spectrogram_diffusion/pipeline_spectrogram_diffusion.py +++ b/src/diffusers/pipelines/deprecated/spectrogram_diffusion/pipeline_spectrogram_diffusion.py @@ -28,7 +28,7 @@ if is_onnx_available(): from ...onnx_utils import OnnxRuntimeModel -from ..pipeline_utils import AudioPipelineOutput, DiffusionPipeline +from ...pipeline_utils import AudioPipelineOutput, DiffusionPipeline from .continuous_encoder import SpectrogramContEncoder from .notes_encoder import SpectrogramNotesEncoder diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py b/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py index eb09b478b359..535bece706c7 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py @@ -37,7 +37,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py index 9206a392ab61..272a7fc7b727 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py @@ -22,7 +22,6 @@ from packaging import version from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer -from ...configuration_utils import FrozenDict from ....image_processor import VaeImageProcessor from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin from ....models import AutoencoderKL, UNet2DConditionModel @@ -40,7 +39,8 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...configuration_utils import FrozenDict +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py index a7d64a579c4f..f3068de32bb3 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py @@ -36,7 +36,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py index 5423d6bca903..0e6e8d999d44 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py @@ -41,7 +41,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.clip_image_project_model import CLIPImageProjection from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py index fd9052317d87..79c6aaf7dda9 100755 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py @@ -42,7 +42,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput, StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py index 776ed5bddb6b..68cbe29d681a 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py @@ -48,7 +48,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py index 578523309ae4..f2a920c0f0ac 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py @@ -22,7 +22,12 @@ from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection from ....image_processor import PipelineImageInput, VaeImageProcessorLDM3D -from ....loaders import FromSingleFileMixin, IPAdapterMixin, StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin +from ....loaders import ( + FromSingleFileMixin, + IPAdapterMixin, + StableDiffusionLoraLoaderMixin, + TextualInversionLoaderMixin, +) from ....models import AutoencoderKL, ImageProjection, UNet2DConditionModel from ....models.lora import adjust_lora_scale_text_encoder from ....schedulers import KarrasDiffusionSchedulers @@ -37,7 +42,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py index e09433f308db..42bbadd56fdf 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py @@ -33,7 +33,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py index 837670b88c22..34e32b6b31e3 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py @@ -7,14 +7,14 @@ from packaging import version from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection -from ...configuration_utils import FrozenDict from ....image_processor import PipelineImageInput from ....loaders import IPAdapterMixin from ....models import AutoencoderKL, ImageProjection, UNet2DConditionModel from ....schedulers import KarrasDiffusionSchedulers from ....utils import deprecate, is_torch_xla_available, logging from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...configuration_utils import FrozenDict +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from . import StableDiffusionSafePipelineOutput from .safety_checker import SafeStableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py index 07986bc709f3..26a13e3b62b6 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py @@ -34,7 +34,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py index 9193932841c1..4bf5e6f15685 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py @@ -29,7 +29,7 @@ from ....schedulers import DDIMScheduler from ....utils import PIL_INTERPOLATION, USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py index f19f914425ca..6296ea935c00 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py @@ -10,7 +10,7 @@ from ....schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler from ....utils import deprecate, logging from ...onnx_utils import ORT_TO_NP_TYPE, OnnxRuntimeModel -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py index 3d087cf20fe3..12a5c8403411 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py @@ -29,7 +29,7 @@ from ....schedulers import KarrasDiffusionSchedulers from ....utils import PIL_INTERPOLATION, USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py index 125a0c633846..9e66be6a4a58 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py @@ -26,7 +26,7 @@ from ....schedulers.scheduling_utils import SchedulerMixin from ....utils import USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py index 98d78d2909c9..b69a07becce9 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py @@ -32,7 +32,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py index b635211e92be..072a097feda0 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py @@ -46,7 +46,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py index 379c1ca8c677..da7f9d3e6b93 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py @@ -33,7 +33,7 @@ ) from ....utils.torch_utils import randn_tensor from ....video_processor import VideoProcessor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from . import TextToVideoSDPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py index 63ba18e476d2..de17cdd847b4 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py @@ -34,7 +34,7 @@ ) from ....utils.torch_utils import randn_tensor from ....video_processor import VideoProcessor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from . import TextToVideoSDPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py index 6a67f4c480ba..098d5209869b 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py @@ -24,7 +24,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py index 5581f80d3514..e9b1aae9974c 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py @@ -35,7 +35,7 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin if is_invisible_watermark_available(): diff --git a/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py index 0b3175e2f2bb..75ad205fddf6 100644 --- a/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py +++ b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py @@ -4,6 +4,7 @@ import torch from torch import nn +from ....utils import logging from ...configuration_utils import ConfigMixin, register_to_config from ...models import ModelMixin from ...models.attention import FeedForward @@ -11,7 +12,6 @@ from ...models.embeddings import TimestepEmbedding, Timesteps, get_2d_sincos_pos_embed from ...models.modeling_outputs import Transformer2DModelOutput from ...models.normalization import AdaLayerNorm -from ....utils import logging logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/unidiffuser/pipeline_unidiffuser.py b/src/diffusers/pipelines/deprecated/unidiffuser/pipeline_unidiffuser.py index 40d30e94423b..d03baf958735 100644 --- a/src/diffusers/pipelines/deprecated/unidiffuser/pipeline_unidiffuser.py +++ b/src/diffusers/pipelines/deprecated/unidiffuser/pipeline_unidiffuser.py @@ -28,7 +28,7 @@ ) from ....utils.outputs import BaseOutput from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from .modeling_text_decoder import UniDiffuserTextDecoder from .modeling_uvit import UniDiffuserModel @@ -225,7 +225,7 @@ def _infer_mode(self, prompt, prompt_embeds, image, latents, prompt_latents, vae return mode - # Copied from ..pipeline_utils.StableDiffusionMixin.enable_vae_slicing + # Copied from ...pipeline_utils.StableDiffusionMixin.enable_vae_slicing def enable_vae_slicing(self): r""" Enable sliced VAE decoding. When this option is enabled, the VAE will split the input tensor in slices to @@ -233,7 +233,7 @@ def enable_vae_slicing(self): """ self.vae.enable_slicing() - # Copied from ..pipeline_utils.StableDiffusionMixin.disable_vae_slicing + # Copied from ...pipeline_utils.StableDiffusionMixin.disable_vae_slicing def disable_vae_slicing(self): r""" Disable sliced VAE decoding. If `enable_vae_slicing` was previously enabled, this method will go back to @@ -241,7 +241,7 @@ def disable_vae_slicing(self): """ self.vae.disable_slicing() - # Copied from ..pipeline_utils.StableDiffusionMixin.enable_vae_tiling + # Copied from ...pipeline_utils.StableDiffusionMixin.enable_vae_tiling def enable_vae_tiling(self): r""" Enable tiled VAE decoding. When this option is enabled, the VAE will split the input tensor into tiles to @@ -250,7 +250,7 @@ def enable_vae_tiling(self): """ self.vae.enable_tiling() - # Copied from ..pipeline_utils.StableDiffusionMixin.disable_vae_tiling + # Copied from ...pipeline_utils.StableDiffusionMixin.disable_vae_tiling def disable_vae_tiling(self): r""" Disable tiled VAE decoding. If `enable_vae_tiling` was previously enabled, this method will go back to diff --git a/src/diffusers/pipelines/deprecated/versatile_diffusion/pipeline_versatile_diffusion.py b/src/diffusers/pipelines/deprecated/versatile_diffusion/pipeline_versatile_diffusion.py index 126dddd253ab..4fb437958abd 100644 --- a/src/diffusers/pipelines/deprecated/versatile_diffusion/pipeline_versatile_diffusion.py +++ b/src/diffusers/pipelines/deprecated/versatile_diffusion/pipeline_versatile_diffusion.py @@ -8,7 +8,7 @@ from ....models import AutoencoderKL, UNet2DConditionModel from ....schedulers import KarrasDiffusionSchedulers from ....utils import logging -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from .pipeline_versatile_diffusion_dual_guided import VersatileDiffusionDualGuidedPipeline from .pipeline_versatile_diffusion_image_variation import VersatileDiffusionImageVariationPipeline from .pipeline_versatile_diffusion_text_to_image import VersatileDiffusionTextToImagePipeline diff --git a/src/diffusers/pipelines/deprecated/wuerstchen/modeling_paella_vq_model.py b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_paella_vq_model.py index ab8d259dc1c5..bf5cc3510148 100644 --- a/src/diffusers/pipelines/deprecated/wuerstchen/modeling_paella_vq_model.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_paella_vq_model.py @@ -18,10 +18,10 @@ import torch import torch.nn as nn -from ...configuration_utils import ConfigMixin, register_to_config -from ...models.autoencoders.vae import DecoderOutput, VectorQuantizer -from ...models.modeling_utils import ModelMixin -from ...models.vq_model import VQEncoderOutput +from ....configuration_utils import ConfigMixin, register_to_config +from ....models.autoencoders.vae import DecoderOutput, VectorQuantizer +from ....models.modeling_utils import ModelMixin +from ....models.vq_model import VQEncoderOutput from ....utils.accelerate_utils import apply_forward_hook diff --git a/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_common.py b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_common.py index 73e71b3076fb..7645a5579c58 100644 --- a/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_common.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_common.py @@ -1,7 +1,7 @@ import torch import torch.nn as nn -from ...models.attention_processor import Attention +from ....models.attention_processor import Attention class WuerstchenLayerNorm(nn.LayerNorm): diff --git a/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_diffnext.py b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_diffnext.py index 6c06cc0e7303..7157287f00b9 100644 --- a/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_diffnext.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_diffnext.py @@ -19,8 +19,8 @@ import torch import torch.nn as nn -from ...configuration_utils import ConfigMixin, register_to_config -from ...models.modeling_utils import ModelMixin +from ....configuration_utils import ConfigMixin, register_to_config +from ....models.modeling_utils import ModelMixin from .modeling_wuerstchen_common import AttnBlock, GlobalResponseNorm, TimestepBlock, WuerstchenLayerNorm diff --git a/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_prior.py b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_prior.py index 9863c506d743..ef34795d3d42 100644 --- a/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_prior.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/modeling_wuerstchen_prior.py @@ -19,16 +19,16 @@ import torch import torch.nn as nn -from ...configuration_utils import ConfigMixin, register_to_config -from ...loaders import PeftAdapterMixin, UNet2DConditionLoadersMixin -from ...models.attention_processor import ( +from ....configuration_utils import ConfigMixin, register_to_config +from ....loaders import PeftAdapterMixin, UNet2DConditionLoadersMixin +from ....models.attention_processor import ( ADDED_KV_ATTENTION_PROCESSORS, CROSS_ATTENTION_PROCESSORS, AttentionProcessor, AttnAddedKVProcessor, AttnProcessor, ) -from ...models.modeling_utils import ModelMixin +from ....models.modeling_utils import ModelMixin from .modeling_wuerstchen_common import AttnBlock, ResBlock, TimestepBlock, WuerstchenLayerNorm diff --git a/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_combined.py b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_combined.py index 4d1bc7abf581..2cf57b2a10c7 100644 --- a/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_combined.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_combined.py @@ -18,7 +18,7 @@ from ....schedulers import DDPMWuerstchenScheduler from ....utils import deprecate, replace_example_docstring -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from .modeling_paella_vq_model import PaellaVQModel from .modeling_wuerstchen_diffnext import WuerstchenDiffNeXt from .modeling_wuerstchen_prior import WuerstchenPrior diff --git a/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py index 7cef8a3be0f7..3c086c187898 100644 --- a/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py @@ -24,7 +24,7 @@ from ....schedulers import DDPMWuerstchenScheduler from ....utils import BaseOutput, deprecate, is_torch_xla_available, logging, replace_example_docstring from ....utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline +from ...pipeline_utils import DiffusionPipeline from .modeling_wuerstchen_prior import WuerstchenPrior From 19afac19fa1aa0c7c62191b7cdfd0c6f07a6272f Mon Sep 17 00:00:00 2001 From: DN6 Date: Thu, 17 Apr 2025 00:41:45 +0530 Subject: [PATCH 03/32] update --- .../deprecated/paint_by_example/image_encoder.py | 2 +- .../pipelines/deprecated/shap_e/renderer.py | 4 ++-- .../pipeline_stable_diffusion_diffedit.py | 2 +- .../pipeline_stable_diffusion_safe.py | 2 +- .../pipelines/deprecated/unclip/text_proj.py | 4 ++-- .../unidiffuser/modeling_text_decoder.py | 4 ++-- .../deprecated/unidiffuser/modeling_uvit.py | 14 +++++++------- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py b/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py index 30f0ea666e6f..ff5073528d44 100644 --- a/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py +++ b/src/diffusers/pipelines/deprecated/paint_by_example/image_encoder.py @@ -15,8 +15,8 @@ from torch import nn from transformers import CLIPPreTrainedModel, CLIPVisionModel +from ....models.attention import BasicTransformerBlock from ....utils import logging -from ...models.attention import BasicTransformerBlock logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/shap_e/renderer.py b/src/diffusers/pipelines/deprecated/shap_e/renderer.py index 52b753440526..0b338849ccd9 100644 --- a/src/diffusers/pipelines/deprecated/shap_e/renderer.py +++ b/src/diffusers/pipelines/deprecated/shap_e/renderer.py @@ -21,9 +21,9 @@ import torch.nn.functional as F from torch import nn +from ....configuration_utils import ConfigMixin, register_to_config +from ....models import ModelMixin from ....utils import BaseOutput -from ...configuration_utils import ConfigMixin, register_to_config -from ...models import ModelMixin from .camera import create_pan_cameras diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py index 272a7fc7b727..cd1e880b709c 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py @@ -22,6 +22,7 @@ from packaging import version from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer +from ....configuration_utils import FrozenDict from ....image_processor import VaeImageProcessor from ....loaders import StableDiffusionLoraLoaderMixin, TextualInversionLoaderMixin from ....models import AutoencoderKL, UNet2DConditionModel @@ -39,7 +40,6 @@ unscale_lora_layers, ) from ....utils.torch_utils import randn_tensor -from ...configuration_utils import FrozenDict from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from ..stable_diffusion import StableDiffusionPipelineOutput from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py index 34e32b6b31e3..d07650ff7600 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py @@ -7,13 +7,13 @@ from packaging import version from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer, CLIPVisionModelWithProjection +from ....configuration_utils import FrozenDict from ....image_processor import PipelineImageInput from ....loaders import IPAdapterMixin from ....models import AutoencoderKL, ImageProjection, UNet2DConditionModel from ....schedulers import KarrasDiffusionSchedulers from ....utils import deprecate, is_torch_xla_available, logging from ....utils.torch_utils import randn_tensor -from ...configuration_utils import FrozenDict from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin from . import StableDiffusionSafePipelineOutput from .safety_checker import SafeStableDiffusionSafetyChecker diff --git a/src/diffusers/pipelines/deprecated/unclip/text_proj.py b/src/diffusers/pipelines/deprecated/unclip/text_proj.py index 5a86d0c08a8d..1aeacab96484 100644 --- a/src/diffusers/pipelines/deprecated/unclip/text_proj.py +++ b/src/diffusers/pipelines/deprecated/unclip/text_proj.py @@ -15,8 +15,8 @@ import torch from torch import nn -from ...configuration_utils import ConfigMixin, register_to_config -from ...models import ModelMixin +from ....configuration_utils import ConfigMixin, register_to_config +from ....models import ModelMixin class UnCLIPTextProjModel(ModelMixin, ConfigMixin): diff --git a/src/diffusers/pipelines/deprecated/unidiffuser/modeling_text_decoder.py b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_text_decoder.py index 75e5d43678d5..a2b0a7a303e8 100644 --- a/src/diffusers/pipelines/deprecated/unidiffuser/modeling_text_decoder.py +++ b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_text_decoder.py @@ -6,8 +6,8 @@ from transformers import GPT2Config, GPT2LMHeadModel from transformers.modeling_utils import ModuleUtilsMixin -from ...configuration_utils import ConfigMixin, register_to_config -from ...models import ModelMixin +from ....configuration_utils import ConfigMixin, register_to_config +from ....models import ModelMixin # Modified from ClipCaptionModel in https://github.com/thu-ml/unidiffuser/blob/main/libs/caption_decoder.py diff --git a/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py index 75ad205fddf6..b560f79d7643 100644 --- a/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py +++ b/src/diffusers/pipelines/deprecated/unidiffuser/modeling_uvit.py @@ -4,14 +4,14 @@ import torch from torch import nn +from ....configuration_utils import ConfigMixin, register_to_config +from ....models import ModelMixin +from ....models.attention import FeedForward +from ....models.attention_processor import Attention +from ....models.embeddings import TimestepEmbedding, Timesteps, get_2d_sincos_pos_embed +from ....models.modeling_outputs import Transformer2DModelOutput +from ....models.normalization import AdaLayerNorm from ....utils import logging -from ...configuration_utils import ConfigMixin, register_to_config -from ...models import ModelMixin -from ...models.attention import FeedForward -from ...models.attention_processor import Attention -from ...models.embeddings import TimestepEmbedding, Timesteps, get_2d_sincos_pos_embed -from ...models.modeling_outputs import Transformer2DModelOutput -from ...models.normalization import AdaLayerNorm logger = logging.get_logger(__name__) # pylint: disable=invalid-name From 99a8f0fca95f85f665509a9d039a9160cf8ffccc Mon Sep 17 00:00:00 2001 From: DN6 Date: Thu, 17 Apr 2025 13:45:08 +0530 Subject: [PATCH 04/32] update --- src/diffusers/pipelines/__init__.py | 4 +- .../pipelines/deprecated/__init__.py | 2 + .../blip_diffusion/__init__.py | 2 +- .../blip_diffusion/blip_image_processing.py | 0 .../blip_diffusion/modeling_blip2.py | 0 .../blip_diffusion/modeling_ctx_clip.py | 0 .../blip_diffusion/pipeline_blip_diffusion.py | 10 ++-- .../deprecated/controlnet/__init__.py | 46 +++++++++++++++++++ .../pipeline_controlnet_blip_diffusion.py | 10 ++-- 9 files changed, 61 insertions(+), 13 deletions(-) rename src/diffusers/pipelines/{ => deprecated}/blip_diffusion/__init__.py (85%) rename src/diffusers/pipelines/{ => deprecated}/blip_diffusion/blip_image_processing.py (100%) rename src/diffusers/pipelines/{ => deprecated}/blip_diffusion/modeling_blip2.py (100%) rename src/diffusers/pipelines/{ => deprecated}/blip_diffusion/modeling_ctx_clip.py (100%) rename src/diffusers/pipelines/{ => deprecated}/blip_diffusion/pipeline_blip_diffusion.py (98%) create mode 100644 src/diffusers/pipelines/deprecated/controlnet/__init__.py rename src/diffusers/pipelines/{ => deprecated}/controlnet/pipeline_controlnet_blip_diffusion.py (98%) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index f58fff33771b..6fdcdf1f53d8 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -149,6 +149,8 @@ "WuerstchenCombinedPipeline", "WuerstchenDecoderPipeline", "WuerstchenPriorPipeline", + "BlipDiffusionPipeline", + "BlipDiffusionControlNetPipeline", ] ) _import_structure["allegro"] = ["AllegroPipeline"] @@ -180,7 +182,6 @@ "AudioLDM2ProjectionModel", "AudioLDM2UNet2DConditionModel", ] - _import_structure["blip_diffusion"] = ["BlipDiffusionPipeline"] _import_structure["cogvideo"] = [ "CogVideoXPipeline", "CogVideoXImageToVideoPipeline", @@ -191,7 +192,6 @@ _import_structure["cogview4"] = ["CogView4Pipeline", "CogView4ControlPipeline"] _import_structure["controlnet"].extend( [ - "BlipDiffusionControlNetPipeline", "StableDiffusionControlNetImg2ImgPipeline", "StableDiffusionControlNetInpaintPipeline", "StableDiffusionControlNetPipeline", diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index 84cbd55dc1c2..7bc85375f76e 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -76,6 +76,8 @@ def __getattr__(self, name): "StableDiffusionControlNetXSPipeline", "StableDiffusionXLControlNetXSPipeline", ] + _import_structure["blip_diffusion"] = ["BlipDiffusionPipeline"] + _import_structure["controlnet"] = ["BlipDiffusionControlNetPipeline"] _import_structure["i2vgen_xl"] = ["I2VGenXLPipeline"] _import_structure["latte"] = ["LattePipeline"] _import_structure["musicldm"] = ["MusicLDMPipeline"] diff --git a/src/diffusers/pipelines/blip_diffusion/__init__.py b/src/diffusers/pipelines/deprecated/blip_diffusion/__init__.py similarity index 85% rename from src/diffusers/pipelines/blip_diffusion/__init__.py rename to src/diffusers/pipelines/deprecated/blip_diffusion/__init__.py index af6c879d5ce8..d6bd9b7c8354 100644 --- a/src/diffusers/pipelines/blip_diffusion/__init__.py +++ b/src/diffusers/pipelines/deprecated/blip_diffusion/__init__.py @@ -5,7 +5,7 @@ import PIL from PIL import Image -from ...utils import OptionalDependencyNotAvailable, is_torch_available, is_transformers_available +from ....utils import OptionalDependencyNotAvailable, is_torch_available, is_transformers_available try: diff --git a/src/diffusers/pipelines/blip_diffusion/blip_image_processing.py b/src/diffusers/pipelines/deprecated/blip_diffusion/blip_image_processing.py similarity index 100% rename from src/diffusers/pipelines/blip_diffusion/blip_image_processing.py rename to src/diffusers/pipelines/deprecated/blip_diffusion/blip_image_processing.py diff --git a/src/diffusers/pipelines/blip_diffusion/modeling_blip2.py b/src/diffusers/pipelines/deprecated/blip_diffusion/modeling_blip2.py similarity index 100% rename from src/diffusers/pipelines/blip_diffusion/modeling_blip2.py rename to src/diffusers/pipelines/deprecated/blip_diffusion/modeling_blip2.py diff --git a/src/diffusers/pipelines/blip_diffusion/modeling_ctx_clip.py b/src/diffusers/pipelines/deprecated/blip_diffusion/modeling_ctx_clip.py similarity index 100% rename from src/diffusers/pipelines/blip_diffusion/modeling_ctx_clip.py rename to src/diffusers/pipelines/deprecated/blip_diffusion/modeling_ctx_clip.py diff --git a/src/diffusers/pipelines/blip_diffusion/pipeline_blip_diffusion.py b/src/diffusers/pipelines/deprecated/blip_diffusion/pipeline_blip_diffusion.py similarity index 98% rename from src/diffusers/pipelines/blip_diffusion/pipeline_blip_diffusion.py rename to src/diffusers/pipelines/deprecated/blip_diffusion/pipeline_blip_diffusion.py index cbd8bef67945..6f467d339d01 100644 --- a/src/diffusers/pipelines/blip_diffusion/pipeline_blip_diffusion.py +++ b/src/diffusers/pipelines/deprecated/blip_diffusion/pipeline_blip_diffusion.py @@ -17,15 +17,15 @@ import torch from transformers import CLIPTokenizer -from ...models import AutoencoderKL, UNet2DConditionModel -from ...schedulers import PNDMScheduler -from ...utils import ( +from ....models import AutoencoderKL, UNet2DConditionModel +from ....schedulers import PNDMScheduler +from ....utils import ( is_torch_xla_available, logging, replace_example_docstring, ) -from ...utils.torch_utils import randn_tensor -from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput +from ....utils.torch_utils import randn_tensor +from ...pipeline_utils import DiffusionPipeline, ImagePipelineOutput from .blip_image_processing import BlipImageProcessor from .modeling_blip2 import Blip2QFormerModel from .modeling_ctx_clip import ContextCLIPTextModel diff --git a/src/diffusers/pipelines/deprecated/controlnet/__init__.py b/src/diffusers/pipelines/deprecated/controlnet/__init__.py new file mode 100644 index 000000000000..0522c6994c54 --- /dev/null +++ b/src/diffusers/pipelines/deprecated/controlnet/__init__.py @@ -0,0 +1,46 @@ +from typing import TYPE_CHECKING + +from ....utils import ( + DIFFUSERS_SLOW_IMPORT, + OptionalDependencyNotAvailable, + _LazyModule, + get_objects_from_module, + is_torch_available, + is_transformers_available, +) + + +_dummy_objects = {} +_import_structure = {} + +try: + if not (is_transformers_available() and is_torch_available()): + raise OptionalDependencyNotAvailable() +except OptionalDependencyNotAvailable: + from ....utils import dummy_torch_and_transformers_objects # noqa F403 + + _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) +else: + _import_structure["pipeline_controlnet_blip_diffusion"] = ["BlipDiffusionControlNetPipeline"] + +if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: + try: + if not (is_transformers_available() and is_torch_available()): + raise OptionalDependencyNotAvailable() + + except OptionalDependencyNotAvailable: + from ...utils.dummy_torch_and_transformers_objects import * + else: + from .pipeline_controlnet_blip_diffusion import BlipDiffusionControlNetPipeline + +else: + import sys + + sys.modules[__name__] = _LazyModule( + __name__, + globals()["__file__"], + _import_structure, + module_spec=__spec__, + ) + for name, value in _dummy_objects.items(): + setattr(sys.modules[__name__], name, value) diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_blip_diffusion.py b/src/diffusers/pipelines/deprecated/controlnet/pipeline_controlnet_blip_diffusion.py similarity index 98% rename from src/diffusers/pipelines/controlnet/pipeline_controlnet_blip_diffusion.py rename to src/diffusers/pipelines/deprecated/controlnet/pipeline_controlnet_blip_diffusion.py index 88c387d48dd2..b3462a740263 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_blip_diffusion.py +++ b/src/diffusers/pipelines/deprecated/controlnet/pipeline_controlnet_blip_diffusion.py @@ -18,18 +18,18 @@ import torch from transformers import CLIPTokenizer -from ...models import AutoencoderKL, ControlNetModel, UNet2DConditionModel -from ...schedulers import PNDMScheduler -from ...utils import ( +from ....models import AutoencoderKL, ControlNetModel, UNet2DConditionModel +from ....schedulers import PNDMScheduler +from ....utils import ( is_torch_xla_available, logging, replace_example_docstring, ) -from ...utils.torch_utils import randn_tensor +from ....utils.torch_utils import randn_tensor +from ...pipeline_utils import DiffusionPipeline, ImagePipelineOutput from ..blip_diffusion.blip_image_processing import BlipImageProcessor from ..blip_diffusion.modeling_blip2 import Blip2QFormerModel from ..blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel -from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput if is_torch_xla_available(): From c9b034b94e102164903564f471ef58774264e587 Mon Sep 17 00:00:00 2001 From: DN6 Date: Thu, 17 Apr 2025 13:50:14 +0530 Subject: [PATCH 05/32] update --- src/diffusers/pipelines/__init__.py | 2 -- src/diffusers/pipelines/deprecated/__init__.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 6fdcdf1f53d8..c9700aee8f96 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -508,7 +508,6 @@ AudioLDM2UNet2DConditionModel, ) from .aura_flow import AuraFlowPipeline - from .blip_diffusion import BlipDiffusionPipeline from .cogvideo import ( CogVideoXFunControlPipeline, CogVideoXImageToVideoPipeline, @@ -518,7 +517,6 @@ from .cogview3 import CogView3PlusPipeline from .cogview4 import CogView4ControlPipeline, CogView4Pipeline from .controlnet import ( - BlipDiffusionControlNetPipeline, StableDiffusionControlNetImg2ImgPipeline, StableDiffusionControlNetInpaintPipeline, StableDiffusionControlNetPipeline, diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index 7bc85375f76e..9eb5fffee7d6 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -181,6 +181,8 @@ def __getattr__(self, name): else: from .alt_diffusion import AltDiffusionImg2ImgPipeline, AltDiffusionPipeline, AltDiffusionPipelineOutput from .audioldm import AudioLDMPipeline + from .blip_diffusion import BlipDiffusionPipeline + from .controlnet import BlipDiffusionControlNetPipeline from .controlnet_xs import StableDiffusionControlNetXSPipeline, StableDiffusionXLControlNetXSPipeline from .i2vgen_xl import I2VGenXLPipeline from .latte import LattePipeline From 01ad7116454a3cb1e290b0580a3b052b85922880 Mon Sep 17 00:00:00 2001 From: DN6 Date: Thu, 17 Apr 2025 14:04:56 +0530 Subject: [PATCH 06/32] update --- tests/pipelines/blipdiffusion/test_blipdiffusion.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/pipelines/blipdiffusion/test_blipdiffusion.py b/tests/pipelines/blipdiffusion/test_blipdiffusion.py index db8d36b23a4b..10ff4ea8b9e8 100644 --- a/tests/pipelines/blipdiffusion/test_blipdiffusion.py +++ b/tests/pipelines/blipdiffusion/test_blipdiffusion.py @@ -23,10 +23,9 @@ from diffusers import AutoencoderKL, BlipDiffusionPipeline, PNDMScheduler, UNet2DConditionModel from diffusers.utils.testing_utils import enable_full_determinism -from src.diffusers.pipelines.blip_diffusion.blip_image_processing import BlipImageProcessor -from src.diffusers.pipelines.blip_diffusion.modeling_blip2 import Blip2QFormerModel -from src.diffusers.pipelines.blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel - +from diffusers.pipelines.deprecated.blip_diffusion.blip_image_processing import BlipImageProcessor +from diffusers.pipelines.deprecated.blip_diffusion.modeling_blip2 import Blip2QFormerModel +from diffusers.pipelines.deprecated.blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel from ..test_pipelines_common import PipelineTesterMixin @@ -195,9 +194,9 @@ def test_blipdiffusion(self): [0.5329548, 0.8372512, 0.33269387, 0.82096875, 0.43657133, 0.3783, 0.5953028, 0.51934963, 0.42142007] ) - assert np.abs(image_slice.flatten() - expected_slice).max() < 1e-2, ( - f" expected_slice {image_slice.flatten()}, but got {image_slice.flatten()}" - ) + assert ( + np.abs(image_slice.flatten() - expected_slice).max() < 1e-2 + ), f" expected_slice {image_slice.flatten()}, but got {image_slice.flatten()}" @unittest.skip("Test not supported because of complexities in deriving query_embeds.") def test_encode_prompt_works_in_isolation(self): From c1aac15394eea72538731fa0c4117990e5b77c1c Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Thu, 17 Apr 2025 11:01:50 +0200 Subject: [PATCH 07/32] update --- src/diffusers/pipelines/pipeline_loading_utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/diffusers/pipelines/pipeline_loading_utils.py b/src/diffusers/pipelines/pipeline_loading_utils.py index 89a403df8d65..7e2764978ce9 100644 --- a/src/diffusers/pipelines/pipeline_loading_utils.py +++ b/src/diffusers/pipelines/pipeline_loading_utils.py @@ -947,6 +947,7 @@ def _get_custom_components_and_folders( diffusers_module = importlib.import_module(__name__.split(".")[0]) pipelines = getattr(diffusers_module, "pipelines") + deprecated_pipelines = getattr(pipelines, "deprecated") # optionally create a custom component <> custom file mapping custom_components = {} @@ -961,7 +962,9 @@ def _get_custom_components_and_folders( if candidate_file in filenames: custom_components[component] = module_candidate - elif module_candidate not in LOADABLE_CLASSES and not hasattr(pipelines, module_candidate): + elif module_candidate not in LOADABLE_CLASSES and ( + not hasattr(pipelines, module_candidate) and not hasattr(deprecated_pipelines, module_candidate) + ): raise ValueError( f"{candidate_file} as defined in `model_index.json` does not exist in {pretrained_model_name} and is not a module in 'diffusers/pipelines'." ) From 6bedba63e8f0d50192dd24ddb5d06505d4d8d25a Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Thu, 17 Apr 2025 12:48:42 +0200 Subject: [PATCH 08/32] update --- src/diffusers/pipelines/pipeline_loading_utils.py | 5 ++++- src/diffusers/pipelines/pipeline_utils.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/diffusers/pipelines/pipeline_loading_utils.py b/src/diffusers/pipelines/pipeline_loading_utils.py index 7e2764978ce9..7150151717fe 100644 --- a/src/diffusers/pipelines/pipeline_loading_utils.py +++ b/src/diffusers/pipelines/pipeline_loading_utils.py @@ -338,6 +338,10 @@ def get_class_obj_and_candidates( component_folder = os.path.join(cache_dir, component_name) if is_pipeline_module: + deprecated_pipelines = getattr(pipelines, "deprecated") + if hasattr(deprecated_pipelines, library_name): + pipelines = deprecated_pipelines + pipeline_module = getattr(pipelines, library_name) class_obj = getattr(pipeline_module, class_name) @@ -679,7 +683,6 @@ def load_sub_model( """Helper method to load the module `name` from `library_name` and `class_name`""" # retrieve class candidates - class_obj, class_candidates = get_class_obj_and_candidates( library_name, class_name, diff --git a/src/diffusers/pipelines/pipeline_utils.py b/src/diffusers/pipelines/pipeline_utils.py index 381def950169..2fcec6d8e787 100644 --- a/src/diffusers/pipelines/pipeline_utils.py +++ b/src/diffusers/pipelines/pipeline_utils.py @@ -939,6 +939,9 @@ def load_module(name, value): # 7.3 Define all importable classes is_pipeline_module = hasattr(pipelines, library_name) + is_deprecated_pipeline_module = hasattr(getattr(pipelines, "deprecated"), library_name) + is_pipeline_module = is_pipeline_module or is_deprecated_pipeline_module + importable_classes = ALL_IMPORTABLE_CLASSES loaded_sub_model = None From e47e0e13e685497cf1c50324288ac5d5f9162e08 Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Thu, 17 Apr 2025 13:20:33 +0200 Subject: [PATCH 09/32] update --- src/diffusers/pipelines/pipeline_utils.py | 5 ++++- tests/pipelines/blipdiffusion/test_blipdiffusion.py | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/diffusers/pipelines/pipeline_utils.py b/src/diffusers/pipelines/pipeline_utils.py index 2fcec6d8e787..7f2437610f30 100644 --- a/src/diffusers/pipelines/pipeline_utils.py +++ b/src/diffusers/pipelines/pipeline_utils.py @@ -938,8 +938,8 @@ def load_module(name, value): class_name = class_name[4:] if class_name.startswith("Flax") else class_name # 7.3 Define all importable classes - is_pipeline_module = hasattr(pipelines, library_name) is_deprecated_pipeline_module = hasattr(getattr(pipelines, "deprecated"), library_name) + is_pipeline_module = hasattr(pipelines, library_name) is_pipeline_module = is_pipeline_module or is_deprecated_pipeline_module importable_classes = ALL_IMPORTABLE_CLASSES @@ -1016,6 +1016,9 @@ def load_module(name, value): # 10. Type checking init arguments for kw, arg in init_kwargs.items(): + # For pipeline kwargs that are not model components + if kw not in expected_types.keys(): + continue # Too complex to validate with type annotation alone if "scheduler" in kw: continue diff --git a/tests/pipelines/blipdiffusion/test_blipdiffusion.py b/tests/pipelines/blipdiffusion/test_blipdiffusion.py index db8d36b23a4b..38482d37abdc 100644 --- a/tests/pipelines/blipdiffusion/test_blipdiffusion.py +++ b/tests/pipelines/blipdiffusion/test_blipdiffusion.py @@ -23,9 +23,9 @@ from diffusers import AutoencoderKL, BlipDiffusionPipeline, PNDMScheduler, UNet2DConditionModel from diffusers.utils.testing_utils import enable_full_determinism -from src.diffusers.pipelines.blip_diffusion.blip_image_processing import BlipImageProcessor -from src.diffusers.pipelines.blip_diffusion.modeling_blip2 import Blip2QFormerModel -from src.diffusers.pipelines.blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel +from diffusers.pipelines.deprecated.blip_diffusion.blip_image_processing import BlipImageProcessor +from diffusers.pipelines.deprecated.blip_diffusion.modeling_blip2 import Blip2QFormerModel +from diffusers.pipelines.deprecated.blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel from ..test_pipelines_common import PipelineTesterMixin @@ -195,9 +195,9 @@ def test_blipdiffusion(self): [0.5329548, 0.8372512, 0.33269387, 0.82096875, 0.43657133, 0.3783, 0.5953028, 0.51934963, 0.42142007] ) - assert np.abs(image_slice.flatten() - expected_slice).max() < 1e-2, ( - f" expected_slice {image_slice.flatten()}, but got {image_slice.flatten()}" - ) + assert ( + np.abs(image_slice.flatten() - expected_slice).max() < 1e-2 + ), f" expected_slice {image_slice.flatten()}, but got {image_slice.flatten()}" @unittest.skip("Test not supported because of complexities in deriving query_embeds.") def test_encode_prompt_works_in_isolation(self): From 5aa47f6152943d4bf3296adf0a55e0e34d0aecf7 Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Thu, 17 Apr 2025 13:57:03 +0200 Subject: [PATCH 10/32] update --- src/diffusers/pipelines/pipeline_loading_utils.py | 5 ++++- tests/pipelines/blipdiffusion/test_blipdiffusion.py | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/diffusers/pipelines/pipeline_loading_utils.py b/src/diffusers/pipelines/pipeline_loading_utils.py index 7150151717fe..ba28f8d98f78 100644 --- a/src/diffusers/pipelines/pipeline_loading_utils.py +++ b/src/diffusers/pipelines/pipeline_loading_utils.py @@ -821,6 +821,7 @@ def _fetch_class_library_tuple(module): # import it here to avoid circular import diffusers_module = importlib.import_module(__name__.split(".")[0]) pipelines = getattr(diffusers_module, "pipelines") + deprecated_pipelines = getattr(pipelines, "deprecated") # register the config from the original module, not the dynamo compiled one not_compiled_module = _unwrap_model(module) @@ -831,7 +832,9 @@ def _fetch_class_library_tuple(module): pipeline_dir = module_path_items[-2] if len(module_path_items) > 2 else None path = not_compiled_module.__module__.split(".") - is_pipeline_module = pipeline_dir in path and hasattr(pipelines, pipeline_dir) + is_pipeline_module = pipeline_dir in path and ( + hasattr(pipelines, pipeline_dir) or hasattr(deprecated_pipelines, pipeline_dir) + ) # if library is not in LOADABLE_CLASSES, then it is a custom module. # Or if it's a pipeline module, then the module is inside the pipeline diff --git a/tests/pipelines/blipdiffusion/test_blipdiffusion.py b/tests/pipelines/blipdiffusion/test_blipdiffusion.py index 38482d37abdc..48844b0a944f 100644 --- a/tests/pipelines/blipdiffusion/test_blipdiffusion.py +++ b/tests/pipelines/blipdiffusion/test_blipdiffusion.py @@ -22,10 +22,10 @@ from transformers.models.clip.configuration_clip import CLIPTextConfig from diffusers import AutoencoderKL, BlipDiffusionPipeline, PNDMScheduler, UNet2DConditionModel -from diffusers.utils.testing_utils import enable_full_determinism from diffusers.pipelines.deprecated.blip_diffusion.blip_image_processing import BlipImageProcessor from diffusers.pipelines.deprecated.blip_diffusion.modeling_blip2 import Blip2QFormerModel from diffusers.pipelines.deprecated.blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel +from diffusers.utils.testing_utils import enable_full_determinism from ..test_pipelines_common import PipelineTesterMixin @@ -195,9 +195,9 @@ def test_blipdiffusion(self): [0.5329548, 0.8372512, 0.33269387, 0.82096875, 0.43657133, 0.3783, 0.5953028, 0.51934963, 0.42142007] ) - assert ( - np.abs(image_slice.flatten() - expected_slice).max() < 1e-2 - ), f" expected_slice {image_slice.flatten()}, but got {image_slice.flatten()}" + assert np.abs(image_slice.flatten() - expected_slice).max() < 1e-2, ( + f" expected_slice {image_slice.flatten()}, but got {image_slice.flatten()}" + ) @unittest.skip("Test not supported because of complexities in deriving query_embeds.") def test_encode_prompt_works_in_isolation(self): From ca1c5ccddc737206a9798cc34bcdd7ba8978dd72 Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Thu, 17 Apr 2025 14:15:00 +0200 Subject: [PATCH 11/32] update --- .../deprecated/alt_diffusion/pipeline_alt_diffusion.py | 2 +- .../alt_diffusion/pipeline_alt_diffusion_img2img.py | 2 +- .../deprecated/controlnet_xs/pipeline_controlnet_xs.py | 4 ++-- .../controlnet_xs/pipeline_controlnet_xs_sd_xl.py | 4 ++-- .../paint_by_example/pipeline_paint_by_example.py | 4 ++-- .../pipeline_semantic_stable_diffusion.py | 2 +- .../pipeline_stable_diffusion_attend_and_excite.py | 4 ++-- .../pipeline_stable_diffusion_diffedit.py | 4 ++-- .../pipeline_stable_diffusion_gligen.py | 4 ++-- .../pipeline_stable_diffusion_gligen_text_image.py | 6 +++--- .../pipeline_stable_diffusion_k_diffusion.py | 2 +- .../pipeline_stable_diffusion_xl_k_diffusion.py | 2 +- .../pipeline_stable_diffusion_ldm3d.py | 2 +- .../pipeline_stable_diffusion_panorama.py | 4 ++-- .../stable_diffusion_sag/pipeline_stable_diffusion_sag.py | 4 ++-- .../stable_diffusion_variants/pipeline_cycle_diffusion.py | 4 ++-- .../pipeline_onnx_stable_diffusion_inpaint_legacy.py | 2 +- .../pipeline_stable_diffusion_inpaint_legacy.py | 4 ++-- .../pipeline_stable_diffusion_model_editing.py | 4 ++-- .../pipeline_stable_diffusion_paradigms.py | 4 ++-- .../pipeline_stable_diffusion_pix2pix_zero.py | 4 ++-- .../text_to_video_synthesis/pipeline_text_to_video_zero.py | 2 +- .../pipeline_text_to_video_zero_sdxl.py | 2 +- tests/pipelines/blipdiffusion/test_blipdiffusion.py | 7 ++++--- 24 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py index 4dce54808d42..48c0aa4f6d76 100644 --- a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py +++ b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py @@ -40,7 +40,7 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .modeling_roberta_series import RobertaSeriesModelWithTransformation from .pipeline_output import AltDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py index 7538ab009856..fa70689d790d 100644 --- a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py +++ b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py @@ -43,7 +43,7 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .modeling_roberta_series import RobertaSeriesModelWithTransformation from .pipeline_output import AltDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py index 3dcb9a5a0dba..a8c936956e28 100644 --- a/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py +++ b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py @@ -27,6 +27,8 @@ from ....models import AutoencoderKL, ControlNetXSAdapter, UNet2DConditionModel, UNetControlNetXSModel from ....models.lora import adjust_lora_scale_text_encoder from ....schedulers import KarrasDiffusionSchedulers +from ....stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ....stable_diffusion.safety_checker import StableDiffusionSafetyChecker from ....utils import ( USE_PEFT_BACKEND, deprecate, @@ -38,8 +40,6 @@ ) from ....utils.torch_utils import is_compiled_module, is_torch_version, randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py index df1bac8f5f88..c1324f8b31db 100644 --- a/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py +++ b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py @@ -38,6 +38,7 @@ ) from ....models.lora import adjust_lora_scale_text_encoder from ....schedulers import KarrasDiffusionSchedulers +from ....stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput from ....utils import ( USE_PEFT_BACKEND, logging, @@ -47,11 +48,10 @@ ) from ....utils.torch_utils import is_compiled_module, is_torch_version, randn_tensor from ...pipeline_utils import DiffusionPipeline -from ...stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput if is_invisible_watermark_available(): - from ..stable_diffusion_xl.watermark import StableDiffusionXLWatermarker + from ...stable_diffusion_xl.watermark import StableDiffusionXLWatermarker from ....utils import is_torch_xla_available diff --git a/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py b/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py index 223925f1cabe..938810957990 100644 --- a/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py +++ b/src/diffusers/pipelines/deprecated/paint_by_example/pipeline_paint_by_example.py @@ -26,8 +26,8 @@ from ....utils import deprecate, is_torch_xla_available, logging from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .image_encoder import PaintByExampleImageEncoder diff --git a/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py index 559639cdff6f..a09160b41989 100644 --- a/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py +++ b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py @@ -8,10 +8,10 @@ from ....image_processor import VaeImageProcessor from ....models import AutoencoderKL, UNet2DConditionModel from ....schedulers import KarrasDiffusionSchedulers +from ....stable_diffusion.safety_checker import StableDiffusionSafetyChecker from ....utils import deprecate, is_torch_xla_available, logging from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .pipeline_output import SemanticStableDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py b/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py index 535bece706c7..fb784d2867f8 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py @@ -38,8 +38,8 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py index cd1e880b709c..592cc793e604 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_diffedit/pipeline_stable_diffusion_diffedit.py @@ -41,8 +41,8 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py index f3068de32bb3..02e3e840d7b0 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen.py @@ -37,8 +37,8 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py index 0e6e8d999d44..4da48bccfbe4 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_gligen/pipeline_stable_diffusion_gligen_text_image.py @@ -42,9 +42,9 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionPipelineOutput -from ..stable_diffusion.clip_image_project_model import CLIPImageProjection -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput +from ...stable_diffusion.clip_image_project_model import CLIPImageProjection +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py index 79c6aaf7dda9..2f0cf0dc7715 100755 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py @@ -43,7 +43,7 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionPipelineOutput, StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput, StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py index 68cbe29d681a..27b8e788dcb6 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py @@ -49,7 +49,7 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput +from ...stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py index f2a920c0f0ac..b37d97cb32e3 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py @@ -43,7 +43,7 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py index 42bbadd56fdf..ba1cb1813db3 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py @@ -34,8 +34,8 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py index 26a13e3b62b6..ac7b66909dd6 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py @@ -35,8 +35,8 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py index 4bf5e6f15685..1752540e8f79 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_cycle_diffusion.py @@ -30,8 +30,8 @@ from ....utils import PIL_INTERPOLATION, USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline -from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py index 6296ea935c00..e9553a8d99b0 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py @@ -11,7 +11,7 @@ from ....utils import deprecate, logging from ...onnx_utils import ORT_TO_NP_TYPE, OnnxRuntimeModel from ...pipeline_utils import DiffusionPipeline -from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py index 12a5c8403411..f9c9c37c4867 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_inpaint_legacy.py @@ -30,8 +30,8 @@ from ....utils import PIL_INTERPOLATION, USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline -from ..stable_diffusion import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py index 9e66be6a4a58..06db871daf62 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_model_editing.py @@ -27,8 +27,8 @@ from ....utils import USE_PEFT_BACKEND, deprecate, logging, scale_lora_layers, unscale_lora_layers from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py index b69a07becce9..d486a32f6a4c 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_paradigms.py @@ -33,8 +33,8 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py index 072a097feda0..509f25620950 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_stable_diffusion_pix2pix_zero.py @@ -47,8 +47,8 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker +from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py index 098d5209869b..4bf745d4993c 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py @@ -25,7 +25,7 @@ ) from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..stable_diffusion import StableDiffusionSafetyChecker +from ...stable_diffusion import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py index e9b1aae9974c..51f05883b191 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py @@ -39,7 +39,7 @@ if is_invisible_watermark_available(): - from ..stable_diffusion_xl.watermark import StableDiffusionXLWatermarker + from ...stable_diffusion_xl.watermark import StableDiffusionXLWatermarker from ....utils import is_torch_xla_available diff --git a/tests/pipelines/blipdiffusion/test_blipdiffusion.py b/tests/pipelines/blipdiffusion/test_blipdiffusion.py index f4749e151a17..48844b0a944f 100644 --- a/tests/pipelines/blipdiffusion/test_blipdiffusion.py +++ b/tests/pipelines/blipdiffusion/test_blipdiffusion.py @@ -26,6 +26,7 @@ from diffusers.pipelines.deprecated.blip_diffusion.modeling_blip2 import Blip2QFormerModel from diffusers.pipelines.deprecated.blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel from diffusers.utils.testing_utils import enable_full_determinism + from ..test_pipelines_common import PipelineTesterMixin @@ -194,9 +195,9 @@ def test_blipdiffusion(self): [0.5329548, 0.8372512, 0.33269387, 0.82096875, 0.43657133, 0.3783, 0.5953028, 0.51934963, 0.42142007] ) - assert ( - np.abs(image_slice.flatten() - expected_slice).max() < 1e-2 - ), f" expected_slice {image_slice.flatten()}, but got {image_slice.flatten()}" + assert np.abs(image_slice.flatten() - expected_slice).max() < 1e-2, ( + f" expected_slice {image_slice.flatten()}, but got {image_slice.flatten()}" + ) @unittest.skip("Test not supported because of complexities in deriving query_embeds.") def test_encode_prompt_works_in_isolation(self): From 4d40ea38979650146d342ece8df54ec98b7f616b Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Fri, 18 Apr 2025 11:24:47 +0200 Subject: [PATCH 12/32] update --- .../pipeline_animatediff_controlnet.py | 4 ++-- .../pipeline_animatediff_img2video.py | 2 +- .../community/pipeline_animatediff_ipex.py | 4 ++-- examples/community/pipeline_stg_cogvideox.py | 2 +- .../community/unclip_image_interpolation.py | 10 ++++----- .../community/unclip_text_interpolation.py | 8 +++---- ...convert_kakao_brain_unclip_to_diffusers.py | 2 +- .../models/unets/unet_stable_cascade.py | 2 +- .../animatediff/pipeline_animatediff_sdxl.py | 4 ++-- .../pipeline_animatediff_sparsectrl.py | 4 ++-- .../pipelines/cogvideo/pipeline_cogvideox.py | 2 +- .../cogview3/pipeline_cogview3plus.py | 2 +- .../i2vgen_xl/pipeline_i2vgen_xl.py | 2 +- .../deprecated/latte/pipeline_latte.py | 2 +- .../pipelines/deprecated/pia/pipeline_pia.py | 4 ++-- .../pipeline_semantic_stable_diffusion.py | 2 +- .../deprecated/shap_e/pipeline_shap_e.py | 2 +- .../shap_e/pipeline_shap_e_img2img.py | 2 +- ...ipeline_stable_diffusion_xl_k_diffusion.py | 4 ++-- .../pipeline_stable_diffusion_safe.py | 2 +- .../pipeline_stable_diffusion_sag.py | 2 +- .../pipeline_text_to_video_synth.py | 2 +- .../pipeline_text_to_video_synth_img2img.py | 2 +- .../pipeline_text_to_video_zero.py | 2 +- .../pipeline_text_to_video_zero_sdxl.py | 22 +++++++++---------- .../unclip/pipeline_unclip_image_variation.py | 2 +- .../wuerstchen/pipeline_wuerstchen.py | 2 +- .../wuerstchen/pipeline_wuerstchen_prior.py | 2 +- .../pipelines/kandinsky/pipeline_kandinsky.py | 2 +- .../kandinsky/pipeline_kandinsky_inpaint.py | 2 +- .../kandinsky/pipeline_kandinsky_prior.py | 2 +- .../kandinsky2_2/pipeline_kandinsky2_2.py | 2 +- .../pipeline_kandinsky2_2_controlnet.py | 2 +- .../pipeline_kandinsky2_2_inpainting.py | 2 +- .../pipeline_kandinsky2_2_prior.py | 2 +- .../pag/pipeline_pag_sd_animatediff.py | 2 +- .../pipeline_stable_unclip.py | 4 ++-- tests/pipelines/unclip/test_unclip.py | 2 +- .../unclip/test_unclip_image_variation.py | 2 +- 39 files changed, 63 insertions(+), 63 deletions(-) diff --git a/examples/community/pipeline_animatediff_controlnet.py b/examples/community/pipeline_animatediff_controlnet.py index 9f99ad248be2..657d58f46d86 100644 --- a/examples/community/pipeline_animatediff_controlnet.py +++ b/examples/community/pipeline_animatediff_controlnet.py @@ -436,7 +436,7 @@ def prepare_ip_adapter_image_embeds( image_embeds = ip_adapter_image_embeds return image_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis/pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents def decode_latents(self, latents): latents = 1 / self.vae.config.scaling_factor * latents @@ -663,7 +663,7 @@ def check_image(self, image, prompt, prompt_embeds): f"If image batch size is not 1, image batch size must be same as prompt batch size. image batch size: {image_batch_size}, prompt batch size: {prompt_batch_size}" ) - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents def prepare_latents( self, batch_size, num_channels_latents, num_frames, height, width, dtype, device, generator, latents=None ): diff --git a/examples/community/pipeline_animatediff_img2video.py b/examples/community/pipeline_animatediff_img2video.py index f7f0cf31c5dd..63d0111db12b 100644 --- a/examples/community/pipeline_animatediff_img2video.py +++ b/examples/community/pipeline_animatediff_img2video.py @@ -553,7 +553,7 @@ def prepare_ip_adapter_image_embeds( image_embeds = ip_adapter_image_embeds return image_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis/pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents def decode_latents(self, latents): latents = 1 / self.vae.config.scaling_factor * latents diff --git a/examples/community/pipeline_animatediff_ipex.py b/examples/community/pipeline_animatediff_ipex.py index 06508f217c4c..90835e671baa 100644 --- a/examples/community/pipeline_animatediff_ipex.py +++ b/examples/community/pipeline_animatediff_ipex.py @@ -425,7 +425,7 @@ def prepare_ip_adapter_image_embeds( return image_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis/pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents def decode_latents(self, latents): latents = 1 / self.vae.config.scaling_factor * latents @@ -520,7 +520,7 @@ def check_inputs( f"`ip_adapter_image_embeds` has to be a list of 3D or 4D tensors but is {ip_adapter_image_embeds[0].ndim}D" ) - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents def prepare_latents( self, batch_size, num_channels_latents, num_frames, height, width, dtype, device, generator, latents=None ): diff --git a/examples/community/pipeline_stg_cogvideox.py b/examples/community/pipeline_stg_cogvideox.py index 2e7f7906a36a..ef387b3848c9 100644 --- a/examples/community/pipeline_stg_cogvideox.py +++ b/examples/community/pipeline_stg_cogvideox.py @@ -427,7 +427,7 @@ def prepare_extra_step_kwargs(self, generator, eta): extra_step_kwargs["generator"] = generator return extra_step_kwargs - # Copied from diffusers.pipelines.latte.pipeline_latte.LattePipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.latte.pipeline_latte.LattePipeline.check_inputs def check_inputs( self, prompt, diff --git a/examples/community/unclip_image_interpolation.py b/examples/community/unclip_image_interpolation.py index 210bd61ecd1d..b66fef981da1 100644 --- a/examples/community/unclip_image_interpolation.py +++ b/examples/community/unclip_image_interpolation.py @@ -18,7 +18,7 @@ UNet2DConditionModel, UNet2DModel, ) -from diffusers.pipelines.unclip import UnCLIPTextProjModel +from diffusers.pipelines.deprecated.unclip import UnCLIPTextProjModel from diffusers.utils import logging from diffusers.utils.torch_utils import randn_tensor @@ -84,7 +84,7 @@ class UnCLIPImageInterpolationPipeline(DiffusionPipeline): decoder_scheduler: UnCLIPScheduler super_res_scheduler: UnCLIPScheduler - # Copied from diffusers.pipelines.unclip.pipeline_unclip_image_variation.UnCLIPImageVariationPipeline.__init__ + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip_image_variation.UnCLIPImageVariationPipeline.__init__ def __init__( self, decoder: UNet2DConditionModel, @@ -113,7 +113,7 @@ def __init__( super_res_scheduler=super_res_scheduler, ) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) @@ -125,7 +125,7 @@ def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): latents = latents * scheduler.init_noise_sigma return latents - # Copied from diffusers.pipelines.unclip.pipeline_unclip_image_variation.UnCLIPImageVariationPipeline._encode_prompt + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip_image_variation.UnCLIPImageVariationPipeline._encode_prompt def _encode_prompt(self, prompt, device, num_images_per_prompt, do_classifier_free_guidance): batch_size = len(prompt) if isinstance(prompt, list) else 1 @@ -189,7 +189,7 @@ def _encode_prompt(self, prompt, device, num_images_per_prompt, do_classifier_fr return prompt_embeds, text_encoder_hidden_states, text_mask - # Copied from diffusers.pipelines.unclip.pipeline_unclip_image_variation.UnCLIPImageVariationPipeline._encode_image + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip_image_variation.UnCLIPImageVariationPipeline._encode_image def _encode_image(self, image, device, num_images_per_prompt, image_embeddings: Optional[torch.Tensor] = None): dtype = next(self.image_encoder.parameters()).dtype diff --git a/examples/community/unclip_text_interpolation.py b/examples/community/unclip_text_interpolation.py index 84f1c5a21f7a..24166d7c150d 100644 --- a/examples/community/unclip_text_interpolation.py +++ b/examples/community/unclip_text_interpolation.py @@ -14,7 +14,7 @@ UNet2DConditionModel, UNet2DModel, ) -from diffusers.pipelines.unclip import UnCLIPTextProjModel +from diffusers.pipelines.deprecated.unclip import UnCLIPTextProjModel from diffusers.utils import logging from diffusers.utils.torch_utils import randn_tensor @@ -78,7 +78,7 @@ class UnCLIPTextInterpolationPipeline(DiffusionPipeline): decoder_scheduler: UnCLIPScheduler super_res_scheduler: UnCLIPScheduler - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.__init__ + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.__init__ def __init__( self, prior: PriorTransformer, @@ -107,7 +107,7 @@ def __init__( super_res_scheduler=super_res_scheduler, ) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) @@ -119,7 +119,7 @@ def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): latents = latents * scheduler.init_noise_sigma return latents - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline._encode_prompt + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline._encode_prompt def _encode_prompt( self, prompt, diff --git a/scripts/convert_kakao_brain_unclip_to_diffusers.py b/scripts/convert_kakao_brain_unclip_to_diffusers.py index 5135eaed5b98..1727005189d0 100644 --- a/scripts/convert_kakao_brain_unclip_to_diffusers.py +++ b/scripts/convert_kakao_brain_unclip_to_diffusers.py @@ -7,7 +7,7 @@ from diffusers import UnCLIPPipeline, UNet2DConditionModel, UNet2DModel from diffusers.models.transformers.prior_transformer import PriorTransformer -from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel +from diffusers.pipelines.deprecated.unclip.text_proj import UnCLIPTextProjModel from diffusers.schedulers.scheduling_unclip import UnCLIPScheduler diff --git a/src/diffusers/models/unets/unet_stable_cascade.py b/src/diffusers/models/unets/unet_stable_cascade.py index f57754435fdc..308b1eca021e 100644 --- a/src/diffusers/models/unets/unet_stable_cascade.py +++ b/src/diffusers/models/unets/unet_stable_cascade.py @@ -27,7 +27,7 @@ from ..modeling_utils import ModelMixin -# Copied from diffusers.pipelines.wuerstchen.modeling_wuerstchen_common.WuerstchenLayerNorm with WuerstchenLayerNorm -> SDCascadeLayerNorm +# Copied from diffusers.pipelines.deprecated.wuerstchen.modeling_wuerstchen_common.WuerstchenLayerNorm with WuerstchenLayerNorm -> SDCascadeLayerNorm class SDCascadeLayerNorm(nn.LayerNorm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py index 958eb5fb5134..cd990e7e2380 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py @@ -635,7 +635,7 @@ def prepare_ip_adapter_image_embeds( return ip_adapter_image_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis/pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents def decode_latents(self, latents): latents = 1 / self.vae.config.scaling_factor * latents @@ -738,7 +738,7 @@ def check_inputs( "If `negative_prompt_embeds` are provided, `negative_pooled_prompt_embeds` also have to be passed. Make sure to generate `negative_pooled_prompt_embeds` from the same text encoder that was used to generate `negative_prompt_embeds`." ) - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents def prepare_latents( self, batch_size, num_channels_latents, num_frames, height, width, dtype, device, generator, latents=None ): diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py index 8c51fddcd5fc..757f1473615c 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py @@ -458,7 +458,7 @@ def prepare_ip_adapter_image_embeds( return ip_adapter_image_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis/pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents def decode_latents(self, latents): latents = 1 / self.vae.config.scaling_factor * latents @@ -621,7 +621,7 @@ def check_image(self, image, prompt, prompt_embeds): f"If image batch size is not 1, image batch size must be same as prompt batch size. image batch size: {image_batch_size}, prompt batch size: {prompt_batch_size}" ) - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents def prepare_latents( self, batch_size, num_channels_latents, num_frames, height, width, dtype, device, generator, latents=None ): diff --git a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox.py b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox.py index 99ae9025cd3e..7f09befde3df 100644 --- a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox.py +++ b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox.py @@ -373,7 +373,7 @@ def prepare_extra_step_kwargs(self, generator, eta): extra_step_kwargs["generator"] = generator return extra_step_kwargs - # Copied from diffusers.pipelines.latte.pipeline_latte.LattePipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.latte.pipeline_latte.LattePipeline.check_inputs def check_inputs( self, prompt, diff --git a/src/diffusers/pipelines/cogview3/pipeline_cogview3plus.py b/src/diffusers/pipelines/cogview3/pipeline_cogview3plus.py index 0cd3943fbcd2..256e10ed72f2 100644 --- a/src/diffusers/pipelines/cogview3/pipeline_cogview3plus.py +++ b/src/diffusers/pipelines/cogview3/pipeline_cogview3plus.py @@ -333,7 +333,7 @@ def prepare_extra_step_kwargs(self, generator, eta): extra_step_kwargs["generator"] = generator return extra_step_kwargs - # Copied from diffusers.pipelines.latte.pipeline_latte.LattePipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.latte.pipeline_latte.LattePipeline.check_inputs def check_inputs( self, prompt, diff --git a/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py b/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py index df8e6b195daf..e7e6038d9e4b 100644 --- a/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py +++ b/src/diffusers/pipelines/deprecated/i2vgen_xl/pipeline_i2vgen_xl.py @@ -479,7 +479,7 @@ def prepare_image_latents( return image_latents - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents def prepare_latents( self, batch_size, num_channels_latents, num_frames, height, width, dtype, device, generator, latents=None ): diff --git a/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py b/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py index 0117f0e7b663..6f4068fc2455 100644 --- a/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py +++ b/src/diffusers/pipelines/deprecated/latte/pipeline_latte.py @@ -561,7 +561,7 @@ def _clean_caption(self, caption): return caption.strip() - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents def prepare_latents( self, batch_size, num_channels_latents, num_frames, height, width, dtype, device, generator, latents=None ): diff --git a/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py index 6401829a8bc3..d60def513655 100644 --- a/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py +++ b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py @@ -422,7 +422,7 @@ def encode_image(self, image, device, num_images_per_prompt, output_hidden_state return image_embeds, uncond_image_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis/pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents def decode_latents(self, latents): latents = 1 / self.vae.config.scaling_factor * latents @@ -562,7 +562,7 @@ def prepare_ip_adapter_image_embeds( return ip_adapter_image_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.prepare_latents def prepare_latents( self, batch_size, num_channels_latents, num_frames, height, width, dtype, device, generator, latents=None ): diff --git a/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py index a09160b41989..80c22347455c 100644 --- a/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py +++ b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py @@ -143,7 +143,7 @@ def prepare_extra_step_kwargs(self, generator, eta): extra_step_kwargs["generator"] = generator return extra_step_kwargs - # Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs def check_inputs( self, prompt, diff --git a/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py index 1018cefa8103..7cf2bb2c8da7 100644 --- a/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py +++ b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e.py @@ -127,7 +127,7 @@ def __init__( shap_e_renderer=shap_e_renderer, ) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py index 3b3e1e84670f..3114059d4741 100644 --- a/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py +++ b/src/diffusers/pipelines/deprecated/shap_e/pipeline_shap_e_img2img.py @@ -128,7 +128,7 @@ def __init__( shap_e_renderer=shap_e_renderer, ) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py index 27b8e788dcb6..dc520600c98f 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py @@ -72,7 +72,7 @@ """ -# Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.ModelWrapper +# Copied from diffusers.pipelines.deprecated.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.ModelWrapper class ModelWrapper: def __init__(self, model, alphas_cumprod): self.model = model @@ -187,7 +187,7 @@ def __init__( else: self.k_diffusion_model = CompVisDenoiser(model) - # Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.set_scheduler + # Copied from diffusers.pipelines.deprecated.stable_diffusion_k_diffusion..pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.set_scheduler def set_scheduler(self, scheduler_type: str): library = importlib.import_module("k_diffusion") sampling = getattr(library, "sampling") diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py index d07650ff7600..9a198d7e6a04 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_safe/pipeline_stable_diffusion_safe.py @@ -372,7 +372,7 @@ def prepare_extra_step_kwargs(self, generator, eta): extra_step_kwargs["generator"] = generator return extra_step_kwargs - # Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs def check_inputs( self, prompt, diff --git a/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py index ac7b66909dd6..9bef2192c991 100644 --- a/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py +++ b/src/diffusers/pipelines/deprecated/stable_diffusion_sag/pipeline_stable_diffusion_sag.py @@ -490,7 +490,7 @@ def prepare_extra_step_kwargs(self, generator, eta): extra_step_kwargs["generator"] = generator return extra_step_kwargs - # Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs def check_inputs( self, prompt, diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py index da7f9d3e6b93..eb0a85e4291f 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth.py @@ -363,7 +363,7 @@ def prepare_extra_step_kwargs(self, generator, eta): extra_step_kwargs["generator"] = generator return extra_step_kwargs - # Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs def check_inputs( self, prompt, diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py index de17cdd847b4..513026a0d8a2 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_synth_img2img.py @@ -368,7 +368,7 @@ def encode_prompt( return prompt_embeds, negative_prompt_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_synth.TextToVideoSDPipeline.decode_latents def decode_latents(self, latents): latents = 1 / self.vae.config.scaling_factor * latents diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py index 4bf745d4993c..7fb295a099db 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero.py @@ -464,7 +464,7 @@ def backward_loop( return latents.clone().detach() - # Copied from diffusers.pipelines.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.stable_diffusion_k_diffusion.pipeline_stable_diffusion_k_diffusion.StableDiffusionKDiffusionPipeline.check_inputs def check_inputs( self, prompt, diff --git a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py index 51f05883b191..5ff541f70574 100644 --- a/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py +++ b/src/diffusers/pipelines/deprecated/text_to_video_synthesis/pipeline_text_to_video_zero_sdxl.py @@ -55,32 +55,32 @@ logger = logging.get_logger(__name__) # pylint: disable=invalid-name -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.rearrange_0 +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.rearrange_0 def rearrange_0(tensor, f): F, C, H, W = tensor.size() tensor = torch.permute(torch.reshape(tensor, (F // f, f, C, H, W)), (0, 2, 1, 3, 4)) return tensor -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.rearrange_1 +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.rearrange_1 def rearrange_1(tensor): B, C, F, H, W = tensor.size() return torch.reshape(torch.permute(tensor, (0, 2, 1, 3, 4)), (B * F, C, H, W)) -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.rearrange_3 +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.rearrange_3 def rearrange_3(tensor, f): F, D, C = tensor.size() return torch.reshape(tensor, (F // f, f, D, C)) -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.rearrange_4 +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.rearrange_4 def rearrange_4(tensor): B, F, D, C = tensor.size() return torch.reshape(tensor, (B * F, D, C)) -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.CrossFrameAttnProcessor +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.CrossFrameAttnProcessor class CrossFrameAttnProcessor: """ Cross frame attention processor. Each frame attends the first frame. @@ -140,7 +140,7 @@ def __call__(self, attn, hidden_states, encoder_hidden_states=None, attention_ma return hidden_states -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.CrossFrameAttnProcessor2_0 +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.CrossFrameAttnProcessor2_0 class CrossFrameAttnProcessor2_0: """ Cross frame attention processor with scaled_dot_product attention of Pytorch 2.0. @@ -230,7 +230,7 @@ class TextToVideoSDXLPipelineOutput(BaseOutput): images: Union[List[PIL.Image.Image], np.ndarray] -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.coords_grid +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.coords_grid def coords_grid(batch, ht, wd, device): # Adapted from https://github.com/princeton-vl/RAFT/blob/master/core/utils/utils.py coords = torch.meshgrid(torch.arange(ht, device=device), torch.arange(wd, device=device)) @@ -238,7 +238,7 @@ def coords_grid(batch, ht, wd, device): return coords[None].repeat(batch, 1, 1, 1) -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.warp_single_latent +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.warp_single_latent def warp_single_latent(latent, reference_flow): """ Warp latent of a single frame with given flow @@ -266,7 +266,7 @@ def warp_single_latent(latent, reference_flow): return warped -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.create_motion_field +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.create_motion_field def create_motion_field(motion_field_strength_x, motion_field_strength_y, frame_ids, device, dtype): """ Create translation motion field @@ -290,7 +290,7 @@ def create_motion_field(motion_field_strength_x, motion_field_strength_y, frame_ return reference_flow -# Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.create_motion_field_and_warp_latents +# Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.create_motion_field_and_warp_latents def create_motion_field_and_warp_latents(motion_field_strength_x, motion_field_strength_y, frame_ids, latents): """ Creates translation motion and warps the latents accordingly @@ -832,7 +832,7 @@ def encode_prompt( return prompt_embeds, negative_prompt_embeds, pooled_prompt_embeds, negative_pooled_prompt_embeds - # Copied from diffusers.pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.TextToVideoZeroPipeline.forward_loop + # Copied from diffusers.pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.TextToVideoZeroPipeline.forward_loop def forward_loop(self, x_t0, t0, t1, generator): """ Perform DDPM forward process from time t0 to t1. This is the same as adding noise with corresponding variance. diff --git a/src/diffusers/pipelines/deprecated/unclip/pipeline_unclip_image_variation.py b/src/diffusers/pipelines/deprecated/unclip/pipeline_unclip_image_variation.py index 1e1787362ec2..816e73c77004 100644 --- a/src/diffusers/pipelines/deprecated/unclip/pipeline_unclip_image_variation.py +++ b/src/diffusers/pipelines/deprecated/unclip/pipeline_unclip_image_variation.py @@ -114,7 +114,7 @@ def __init__( super_res_scheduler=super_res_scheduler, ) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen.py b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen.py index 43861bb9b697..293794d3ea5c 100644 --- a/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen.py @@ -107,7 +107,7 @@ def __init__( ) self.register_to_config(latent_dim_scale=latent_dim_scale) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py index 3c086c187898..82df873872e7 100644 --- a/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py +++ b/src/diffusers/pipelines/deprecated/wuerstchen/pipeline_wuerstchen_prior.py @@ -126,7 +126,7 @@ def __init__( latent_mean=latent_mean, latent_std=latent_std, resolution_multiple=resolution_multiple ) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/kandinsky/pipeline_kandinsky.py b/src/diffusers/pipelines/kandinsky/pipeline_kandinsky.py index b5f4acf5c05a..e63c4c3eff16 100644 --- a/src/diffusers/pipelines/kandinsky/pipeline_kandinsky.py +++ b/src/diffusers/pipelines/kandinsky/pipeline_kandinsky.py @@ -123,7 +123,7 @@ def __init__( ) self.movq_scale_factor = 2 ** (len(self.movq.config.block_out_channels) - 1) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/kandinsky/pipeline_kandinsky_inpaint.py b/src/diffusers/pipelines/kandinsky/pipeline_kandinsky_inpaint.py index 769c834ec3cc..c77318b37809 100644 --- a/src/diffusers/pipelines/kandinsky/pipeline_kandinsky_inpaint.py +++ b/src/diffusers/pipelines/kandinsky/pipeline_kandinsky_inpaint.py @@ -288,7 +288,7 @@ def __init__( self.movq_scale_factor = 2 ** (len(self.movq.config.block_out_channels) - 1) self._warn_has_been_called = False - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/kandinsky/pipeline_kandinsky_prior.py b/src/diffusers/pipelines/kandinsky/pipeline_kandinsky_prior.py index a348deef8b29..7ef00fb655c4 100644 --- a/src/diffusers/pipelines/kandinsky/pipeline_kandinsky_prior.py +++ b/src/diffusers/pipelines/kandinsky/pipeline_kandinsky_prior.py @@ -285,7 +285,7 @@ def interpolate( return KandinskyPriorPipelineOutput(image_embeds=image_emb, negative_image_embeds=zero_image_emb) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2.py b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2.py index a584674540d8..f90c331d0b24 100644 --- a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2.py +++ b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2.py @@ -103,7 +103,7 @@ def __init__( ) self.movq_scale_factor = 2 ** (len(self.movq.config.block_out_channels) - 1) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_controlnet.py b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_controlnet.py index bada59080c7b..1e160db25ad2 100644 --- a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_controlnet.py +++ b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_controlnet.py @@ -145,7 +145,7 @@ def __init__( ) self.movq_scale_factor = 2 ** (len(self.movq.config.block_out_channels) - 1) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_inpainting.py b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_inpainting.py index 482093a4bb29..5bfd1b6de984 100644 --- a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_inpainting.py +++ b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_inpainting.py @@ -275,7 +275,7 @@ def __init__( self.movq_scale_factor = 2 ** (len(self.movq.config.block_out_channels) - 1) self._warn_has_been_called = False - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_prior.py b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_prior.py index d05a7fbdb1b8..b40b4b435dee 100644 --- a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_prior.py +++ b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_prior.py @@ -244,7 +244,7 @@ def interpolate( return KandinskyPriorPipelineOutput(image_embeds=image_emb, negative_image_embeds=zero_image_emb) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py index d3a015e569c1..8942c4af0ecb 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py @@ -452,7 +452,7 @@ def prepare_extra_step_kwargs(self, generator, eta): extra_step_kwargs["generator"] = generator return extra_step_kwargs - # Copied from diffusers.pipelines.pia.pipeline_pia.PIAPipeline.check_inputs + # Copied from diffusers.pipelines.deprecated.pia.pipeline_pia.PIAPipeline.check_inputs def check_inputs( self, prompt, diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_unclip.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_unclip.py index be01e0acbf18..327eecfed6f1 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_unclip.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_unclip.py @@ -166,7 +166,7 @@ def __init__( self.vae_scale_factor = 2 ** (len(self.vae.config.block_out_channels) - 1) if getattr(self, "vae", None) else 8 self.image_processor = VaeImageProcessor(vae_scale_factor=self.vae_scale_factor) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline._encode_prompt with _encode_prompt->_encode_prior_prompt, tokenizer->prior_tokenizer, text_encoder->prior_text_encoder + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline._encode_prompt with _encode_prompt->_encode_prior_prompt, tokenizer->prior_tokenizer, text_encoder->prior_text_encoder def _encode_prior_prompt( self, prompt, @@ -584,7 +584,7 @@ def check_inputs( f"`noise_level` must be between 0 and {self.image_noising_scheduler.config.num_train_timesteps - 1}, inclusive." ) - # Copied from diffusers.pipelines.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents + # Copied from diffusers.pipelines.deprecated.unclip.pipeline_unclip.UnCLIPPipeline.prepare_latents def prepare_latents(self, shape, dtype, device, generator, latents, scheduler): if latents is None: latents = randn_tensor(shape, generator=generator, device=device, dtype=dtype) diff --git a/tests/pipelines/unclip/test_unclip.py b/tests/pipelines/unclip/test_unclip.py index 834d97f30d18..005509c688ae 100644 --- a/tests/pipelines/unclip/test_unclip.py +++ b/tests/pipelines/unclip/test_unclip.py @@ -21,7 +21,7 @@ from transformers import CLIPTextConfig, CLIPTextModelWithProjection, CLIPTokenizer from diffusers import PriorTransformer, UnCLIPPipeline, UnCLIPScheduler, UNet2DConditionModel, UNet2DModel -from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel +from diffusers.pipelines.deprecated.unclip.text_proj import UnCLIPTextProjModel from diffusers.utils.testing_utils import ( enable_full_determinism, load_numpy, diff --git a/tests/pipelines/unclip/test_unclip_image_variation.py b/tests/pipelines/unclip/test_unclip_image_variation.py index e402629fe1b9..2e079a125d13 100644 --- a/tests/pipelines/unclip/test_unclip_image_variation.py +++ b/tests/pipelines/unclip/test_unclip_image_variation.py @@ -35,7 +35,7 @@ UNet2DConditionModel, UNet2DModel, ) -from diffusers.pipelines.unclip.text_proj import UnCLIPTextProjModel +from diffusers.pipelines.deprecated.unclip.text_proj import UnCLIPTextProjModel from diffusers.utils.testing_utils import ( enable_full_determinism, floats_tensor, From 05b0162b73ba949d42fcfa1945074cbe4c47101e Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Fri, 18 Apr 2025 11:44:18 +0200 Subject: [PATCH 13/32] update --- .../train_text_to_image_lora_prior.py | 2 +- .../train_text_to_image_prior.py | 2 +- scripts/convert_stable_cascade.py | 2 +- scripts/convert_stable_cascade_lite.py | 2 +- scripts/convert_wuerstchen.py | 2 +- src/diffusers/pipelines/__init__.py | 22 +++++++++++++------ src/diffusers/pipelines/auto_pipeline.py | 2 +- .../controlnet_xs/pipeline_controlnet_xs.py | 4 ++-- .../pipeline_controlnet_xs_sd_xl.py | 2 +- .../pipelines/deprecated/pia/pipeline_pia.py | 2 +- .../pipeline_semantic_stable_diffusion.py | 2 +- .../stable_cascade/pipeline_stable_cascade.py | 2 +- .../pipeline_stable_cascade_combined.py | 2 +- .../test_stable_cascade_combined.py | 2 +- .../test_stable_cascade_decoder.py | 2 +- .../wuerstchen/test_wuerstchen_combined.py | 2 +- .../wuerstchen/test_wuerstchen_decoder.py | 2 +- .../wuerstchen/test_wuerstchen_prior.py | 2 +- 18 files changed, 33 insertions(+), 25 deletions(-) diff --git a/examples/research_projects/wuerstchen/text_to_image/train_text_to_image_lora_prior.py b/examples/research_projects/wuerstchen/text_to_image/train_text_to_image_lora_prior.py index 9e2302f1b1ba..7c2fbe915762 100644 --- a/examples/research_projects/wuerstchen/text_to_image/train_text_to_image_lora_prior.py +++ b/examples/research_projects/wuerstchen/text_to_image/train_text_to_image_lora_prior.py @@ -40,7 +40,7 @@ from diffusers import AutoPipelineForText2Image, DDPMWuerstchenScheduler, WuerstchenPriorPipeline from diffusers.optimization import get_scheduler -from diffusers.pipelines.wuerstchen import DEFAULT_STAGE_C_TIMESTEPS, WuerstchenPrior +from diffusers.pipelines.deprecated.wuerstchen import DEFAULT_STAGE_C_TIMESTEPS, WuerstchenPrior from diffusers.utils import check_min_version, is_wandb_available, make_image_grid from diffusers.utils.logging import set_verbosity_error, set_verbosity_info diff --git a/examples/research_projects/wuerstchen/text_to_image/train_text_to_image_prior.py b/examples/research_projects/wuerstchen/text_to_image/train_text_to_image_prior.py index 83647097d28a..62d0e8f0db9c 100644 --- a/examples/research_projects/wuerstchen/text_to_image/train_text_to_image_prior.py +++ b/examples/research_projects/wuerstchen/text_to_image/train_text_to_image_prior.py @@ -40,7 +40,7 @@ from diffusers import AutoPipelineForText2Image, DDPMWuerstchenScheduler from diffusers.optimization import get_scheduler -from diffusers.pipelines.wuerstchen import DEFAULT_STAGE_C_TIMESTEPS, WuerstchenPrior +from diffusers.pipelines.deprecated.wuerstchen import DEFAULT_STAGE_C_TIMESTEPS, WuerstchenPrior from diffusers.training_utils import EMAModel from diffusers.utils import check_min_version, is_wandb_available, make_image_grid from diffusers.utils.logging import set_verbosity_error, set_verbosity_info diff --git a/scripts/convert_stable_cascade.py b/scripts/convert_stable_cascade.py index ce10970b0b6a..1a3fa117d769 100644 --- a/scripts/convert_stable_cascade.py +++ b/scripts/convert_stable_cascade.py @@ -21,7 +21,7 @@ from diffusers.loaders.single_file_utils import convert_stable_cascade_unet_single_file_to_diffusers from diffusers.models import StableCascadeUNet from diffusers.models.modeling_utils import load_model_dict_into_meta -from diffusers.pipelines.wuerstchen import PaellaVQModel +from diffusers.pipelines.deprecated.wuerstchen import PaellaVQModel from diffusers.utils import is_accelerate_available diff --git a/scripts/convert_stable_cascade_lite.py b/scripts/convert_stable_cascade_lite.py index ddccaa3b2e8a..2702474fe045 100644 --- a/scripts/convert_stable_cascade_lite.py +++ b/scripts/convert_stable_cascade_lite.py @@ -21,7 +21,7 @@ from diffusers.loaders.single_file_utils import convert_stable_cascade_unet_single_file_to_diffusers from diffusers.models import StableCascadeUNet from diffusers.models.modeling_utils import load_model_dict_into_meta -from diffusers.pipelines.wuerstchen import PaellaVQModel +from diffusers.pipelines.deprecated.wuerstchen import PaellaVQModel from diffusers.utils import is_accelerate_available diff --git a/scripts/convert_wuerstchen.py b/scripts/convert_wuerstchen.py index 23d45d3dd6ad..6f97309d72cf 100644 --- a/scripts/convert_wuerstchen.py +++ b/scripts/convert_wuerstchen.py @@ -11,7 +11,7 @@ WuerstchenDecoderPipeline, WuerstchenPriorPipeline, ) -from diffusers.pipelines.wuerstchen import PaellaVQModel, WuerstchenDiffNeXt, WuerstchenPrior +from diffusers.pipelines.deprecated.wuerstchen import PaellaVQModel, WuerstchenDiffNeXt, WuerstchenPrior model_path = "models/" diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index c9700aee8f96..30a9d98bf031 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -48,7 +48,6 @@ "AutoPipelineForText2Image", ] _import_structure["consistency_models"] = ["ConsistencyModelPipeline"] - _import_structure["dance_diffusion"] = ["DanceDiffusionPipeline"] _import_structure["ddim"] = ["DDIMPipeline"] _import_structure["ddpm"] = ["DDPMPipeline"] _import_structure["dit"] = ["DiTPipeline"] @@ -62,6 +61,7 @@ _import_structure["deprecated"].extend( [ "PNDMPipeline", + "DanceDiffusionPipeline", "LDMPipeline", "RePaintPipeline", "ScoreSdeVePipeline", @@ -387,10 +387,12 @@ _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_and_k_diffusion_objects)) else: - _import_structure["stable_diffusion_k_diffusion"] = [ - "StableDiffusionKDiffusionPipeline", - "StableDiffusionXLKDiffusionPipeline", - ] + _import_structure["deprecated"].extend( + [ + "StableDiffusionKDiffusionPipeline", + "StableDiffusionXLKDiffusionPipeline", + ] + ) try: if not (is_torch_available() and is_transformers_available() and is_sentencepiece_available()): @@ -464,10 +466,16 @@ AutoPipelineForText2Image, ) from .consistency_models import ConsistencyModelPipeline - from .dance_diffusion import DanceDiffusionPipeline from .ddim import DDIMPipeline from .ddpm import DDPMPipeline - from .deprecated import KarrasVePipeline, LDMPipeline, PNDMPipeline, RePaintPipeline, ScoreSdeVePipeline + from .deprecated import ( + DanceDiffusionPipeline, + KarrasVePipeline, + LDMPipeline, + PNDMPipeline, + RePaintPipeline, + ScoreSdeVePipeline, + ) from .dit import DiTPipeline from .latent_diffusion import LDMSuperResolutionPipeline from .pipeline_utils import ( diff --git a/src/diffusers/pipelines/auto_pipeline.py b/src/diffusers/pipelines/auto_pipeline.py index 6a5f6098b6fb..071bda53ed67 100644 --- a/src/diffusers/pipelines/auto_pipeline.py +++ b/src/diffusers/pipelines/auto_pipeline.py @@ -39,6 +39,7 @@ StableDiffusion3ControlNetPipeline, ) from .deepfloyd_if import IFImg2ImgPipeline, IFInpaintingPipeline, IFPipeline +from .deprecated.wuerstchen import WuerstchenCombinedPipeline, WuerstchenDecoderPipeline from .flux import ( FluxControlImg2ImgPipeline, FluxControlInpaintPipeline, @@ -106,7 +107,6 @@ StableDiffusionXLInpaintPipeline, StableDiffusionXLPipeline, ) -from .wuerstchen import WuerstchenCombinedPipeline, WuerstchenDecoderPipeline AUTO_TEXT2IMAGE_PIPELINES_MAPPING = OrderedDict( diff --git a/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py index a8c936956e28..3dcb9a5a0dba 100644 --- a/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py +++ b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs.py @@ -27,8 +27,6 @@ from ....models import AutoencoderKL, ControlNetXSAdapter, UNet2DConditionModel, UNetControlNetXSModel from ....models.lora import adjust_lora_scale_text_encoder from ....schedulers import KarrasDiffusionSchedulers -from ....stable_diffusion.pipeline_output import StableDiffusionPipelineOutput -from ....stable_diffusion.safety_checker import StableDiffusionSafetyChecker from ....utils import ( USE_PEFT_BACKEND, deprecate, @@ -40,6 +38,8 @@ ) from ....utils.torch_utils import is_compiled_module, is_torch_version, randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py index c1324f8b31db..b63223d18a1c 100644 --- a/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py +++ b/src/diffusers/pipelines/deprecated/controlnet_xs/pipeline_controlnet_xs_sd_xl.py @@ -38,7 +38,6 @@ ) from ....models.lora import adjust_lora_scale_text_encoder from ....schedulers import KarrasDiffusionSchedulers -from ....stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput from ....utils import ( USE_PEFT_BACKEND, logging, @@ -48,6 +47,7 @@ ) from ....utils.torch_utils import is_compiled_module, is_torch_version, randn_tensor from ...pipeline_utils import DiffusionPipeline +from ...stable_diffusion_xl.pipeline_output import StableDiffusionXLPipelineOutput if is_invisible_watermark_available(): diff --git a/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py index d60def513655..8f81dd2a1f39 100644 --- a/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py +++ b/src/diffusers/pipelines/deprecated/pia/pipeline_pia.py @@ -50,8 +50,8 @@ ) from ....utils.torch_utils import randn_tensor from ....video_processor import VideoProcessor +from ...free_init_utils import FreeInitMixin from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin -from ..free_init_utils import FreeInitMixin if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py index 80c22347455c..5bc1745e72a4 100644 --- a/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py +++ b/src/diffusers/pipelines/deprecated/semantic_stable_diffusion/pipeline_semantic_stable_diffusion.py @@ -8,10 +8,10 @@ from ....image_processor import VaeImageProcessor from ....models import AutoencoderKL, UNet2DConditionModel from ....schedulers import KarrasDiffusionSchedulers -from ....stable_diffusion.safety_checker import StableDiffusionSafetyChecker from ....utils import deprecate, is_torch_xla_available, logging from ....utils.torch_utils import randn_tensor from ...pipeline_utils import DiffusionPipeline, StableDiffusionMixin +from ...stable_diffusion.safety_checker import StableDiffusionSafetyChecker from .pipeline_output import SemanticStableDiffusionPipelineOutput diff --git a/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade.py b/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade.py index 38f1c4314e4f..357fe8f96112 100644 --- a/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade.py +++ b/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade.py @@ -21,8 +21,8 @@ from ...schedulers import DDPMWuerstchenScheduler from ...utils import is_torch_version, is_torch_xla_available, logging, replace_example_docstring from ...utils.torch_utils import randn_tensor +from ..deprecated.wuerstchen.modeling_paella_vq_model import PaellaVQModel from ..pipeline_utils import DiffusionPipeline, ImagePipelineOutput -from ..wuerstchen.modeling_paella_vq_model import PaellaVQModel if is_torch_xla_available(): diff --git a/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade_combined.py b/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade_combined.py index 28a74ab83733..067e7acd66cd 100644 --- a/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade_combined.py +++ b/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade_combined.py @@ -20,8 +20,8 @@ from ...models import StableCascadeUNet from ...schedulers import DDPMWuerstchenScheduler from ...utils import is_torch_version, replace_example_docstring +from ..deprecated.wuerstchen.modeling_paella_vq_model import PaellaVQModel from ..pipeline_utils import DiffusionPipeline -from ..wuerstchen.modeling_paella_vq_model import PaellaVQModel from .pipeline_stable_cascade import StableCascadeDecoderPipeline from .pipeline_stable_cascade_prior import StableCascadePriorPipeline diff --git a/tests/pipelines/stable_cascade/test_stable_cascade_combined.py b/tests/pipelines/stable_cascade/test_stable_cascade_combined.py index d433a461bd9d..0ba868e46666 100644 --- a/tests/pipelines/stable_cascade/test_stable_cascade_combined.py +++ b/tests/pipelines/stable_cascade/test_stable_cascade_combined.py @@ -21,7 +21,7 @@ from diffusers import DDPMWuerstchenScheduler, StableCascadeCombinedPipeline from diffusers.models import StableCascadeUNet -from diffusers.pipelines.wuerstchen import PaellaVQModel +from diffusers.pipelines.deprecated.wuerstchen import PaellaVQModel from diffusers.utils.testing_utils import enable_full_determinism, require_torch_accelerator, torch_device from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/stable_cascade/test_stable_cascade_decoder.py b/tests/pipelines/stable_cascade/test_stable_cascade_decoder.py index afcd8fca71ca..f7bebc052c59 100644 --- a/tests/pipelines/stable_cascade/test_stable_cascade_decoder.py +++ b/tests/pipelines/stable_cascade/test_stable_cascade_decoder.py @@ -22,7 +22,7 @@ from diffusers import DDPMWuerstchenScheduler, StableCascadeDecoderPipeline from diffusers.models import StableCascadeUNet -from diffusers.pipelines.wuerstchen import PaellaVQModel +from diffusers.pipelines.deprecated.wuerstchen import PaellaVQModel from diffusers.utils.testing_utils import ( backend_empty_cache, enable_full_determinism, diff --git a/tests/pipelines/wuerstchen/test_wuerstchen_combined.py b/tests/pipelines/wuerstchen/test_wuerstchen_combined.py index fa544c91f2d9..1a3457058d5d 100644 --- a/tests/pipelines/wuerstchen/test_wuerstchen_combined.py +++ b/tests/pipelines/wuerstchen/test_wuerstchen_combined.py @@ -20,7 +20,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import DDPMWuerstchenScheduler, WuerstchenCombinedPipeline -from diffusers.pipelines.wuerstchen import PaellaVQModel, WuerstchenDiffNeXt, WuerstchenPrior +from diffusers.pipelines.deprecated.wuerstchen import PaellaVQModel, WuerstchenDiffNeXt, WuerstchenPrior from diffusers.utils.testing_utils import enable_full_determinism, require_torch_accelerator, torch_device from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/wuerstchen/test_wuerstchen_decoder.py b/tests/pipelines/wuerstchen/test_wuerstchen_decoder.py index 97d1a1cc3830..687a831ce843 100644 --- a/tests/pipelines/wuerstchen/test_wuerstchen_decoder.py +++ b/tests/pipelines/wuerstchen/test_wuerstchen_decoder.py @@ -20,7 +20,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import DDPMWuerstchenScheduler, WuerstchenDecoderPipeline -from diffusers.pipelines.wuerstchen import PaellaVQModel, WuerstchenDiffNeXt +from diffusers.pipelines.deprecated.wuerstchen import PaellaVQModel, WuerstchenDiffNeXt from diffusers.utils.testing_utils import enable_full_determinism, skip_mps, torch_device from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/wuerstchen/test_wuerstchen_prior.py b/tests/pipelines/wuerstchen/test_wuerstchen_prior.py index 4bc086e7f65b..858b1cbf7a45 100644 --- a/tests/pipelines/wuerstchen/test_wuerstchen_prior.py +++ b/tests/pipelines/wuerstchen/test_wuerstchen_prior.py @@ -20,7 +20,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import DDPMWuerstchenScheduler, WuerstchenPriorPipeline -from diffusers.pipelines.wuerstchen import WuerstchenPrior +from diffusers.pipelines.deprecated.wuerstchen import WuerstchenPrior from diffusers.utils.import_utils import is_peft_available from diffusers.utils.testing_utils import enable_full_determinism, require_peft_backend, skip_mps, torch_device From 3c3556e5fef06e6e4b0d64297ff4128ca0bf4fd2 Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Fri, 18 Apr 2025 11:49:58 +0200 Subject: [PATCH 14/32] update --- src/diffusers/pipelines/controlnet/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/diffusers/pipelines/controlnet/__init__.py b/src/diffusers/pipelines/controlnet/__init__.py index a49dccf235a3..3400d85d694d 100644 --- a/src/diffusers/pipelines/controlnet/__init__.py +++ b/src/diffusers/pipelines/controlnet/__init__.py @@ -24,7 +24,6 @@ else: _import_structure["multicontrolnet"] = ["MultiControlNetModel"] _import_structure["pipeline_controlnet"] = ["StableDiffusionControlNetPipeline"] - _import_structure["pipeline_controlnet_blip_diffusion"] = ["BlipDiffusionControlNetPipeline"] _import_structure["pipeline_controlnet_img2img"] = ["StableDiffusionControlNetImg2ImgPipeline"] _import_structure["pipeline_controlnet_inpaint"] = ["StableDiffusionControlNetInpaintPipeline"] _import_structure["pipeline_controlnet_inpaint_sd_xl"] = ["StableDiffusionXLControlNetInpaintPipeline"] @@ -54,7 +53,6 @@ else: from .multicontrolnet import MultiControlNetModel from .pipeline_controlnet import StableDiffusionControlNetPipeline - from .pipeline_controlnet_blip_diffusion import BlipDiffusionControlNetPipeline from .pipeline_controlnet_img2img import StableDiffusionControlNetImg2ImgPipeline from .pipeline_controlnet_inpaint import StableDiffusionControlNetInpaintPipeline from .pipeline_controlnet_inpaint_sd_xl import StableDiffusionXLControlNetInpaintPipeline From f3553fed365da6f2db9b097dcbce102c74cbb926 Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Fri, 18 Apr 2025 14:34:06 +0200 Subject: [PATCH 15/32] update --- scripts/convert_shap_e_to_diffusers.py | 2 +- src/diffusers/pipelines/__init__.py | 42 +++++++------------ .../pipelines/deprecated/__init__.py | 4 ++ .../test_controlnet_blip_diffusion.py | 6 +-- .../paint_by_example/test_paint_by_example.py | 2 +- .../test_semantic_diffusion.py | 4 +- tests/pipelines/shap_e/test_shap_e.py | 2 +- tests/pipelines/shap_e/test_shap_e_img2img.py | 2 +- .../test_safe_diffusion.py | 2 +- 9 files changed, 29 insertions(+), 37 deletions(-) diff --git a/scripts/convert_shap_e_to_diffusers.py b/scripts/convert_shap_e_to_diffusers.py index b903b4ee8a7f..043cb282da23 100644 --- a/scripts/convert_shap_e_to_diffusers.py +++ b/scripts/convert_shap_e_to_diffusers.py @@ -5,7 +5,7 @@ from accelerate import load_checkpoint_and_dispatch from diffusers.models.transformers.prior_transformer import PriorTransformer -from diffusers.pipelines.shap_e import ShapERenderer +from diffusers.pipelines.deprecated.shap_e import ShapERenderer """ diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 30a9d98bf031..5f0cd391a7b4 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -107,6 +107,7 @@ "AltDiffusionPipeline", "AltDiffusionImg2ImgPipeline", "CycleDiffusionPipeline", + "StableDiffusionLDM3DPipeline", "StableDiffusionInpaintPipelineLegacy", "StableDiffusionPix2PixZeroPipeline", "StableDiffusionParadigmsPipeline", @@ -327,7 +328,6 @@ "StableDiffusionUpscalePipeline", "StableUnCLIPImg2ImgPipeline", "StableUnCLIPPipeline", - "StableDiffusionLDM3DPipeline", ] ) _import_structure["aura_flow"] = ["AuraFlowPipeline"] @@ -555,15 +555,27 @@ AltDiffusionImg2ImgPipeline, AltDiffusionPipeline, CycleDiffusionPipeline, + PaintByExamplePipeline, + StableDiffusionAttendAndExcitePipeline, + StableDiffusionControlNetXSPipeline, + StableDiffusionDiffEditPipeline, + StableDiffusionGLIGENPipeline, + StableDiffusionGLIGENTextImagePipeline, StableDiffusionInpaintPipelineLegacy, StableDiffusionModelEditingPipeline, + StableDiffusionPanoramaPipeline, StableDiffusionParadigmsPipeline, StableDiffusionPix2PixZeroPipeline, + StableDiffusionXLControlNetXSPipeline, VersatileDiffusionDualGuidedPipeline, VersatileDiffusionImageVariationPipeline, VersatileDiffusionPipeline, VersatileDiffusionTextToImagePipeline, + VideoToVideoSDPipeline, VQDiffusionPipeline, + WuerstchenCombinedPipeline, + WuerstchenDecoderPipeline, + WuerstchenPriorPipeline, ) from .easyanimate import ( EasyAnimateControlPipeline, @@ -659,7 +671,6 @@ StableDiffusionXLPAGInpaintPipeline, StableDiffusionXLPAGPipeline, ) - from .paint_by_example import PaintByExamplePipeline from .pia import PIAPipeline from .pixart_alpha import PixArtAlphaPipeline, PixArtSigmaPipeline from .sana import SanaControlNetPipeline, SanaPipeline, SanaSprintPipeline @@ -689,13 +700,6 @@ StableDiffusion3InpaintPipeline, StableDiffusion3Pipeline, ) - from .stable_diffusion_attend_and_excite import StableDiffusionAttendAndExcitePipeline - from .stable_diffusion_diffedit import StableDiffusionDiffEditPipeline - from .stable_diffusion_gligen import StableDiffusionGLIGENPipeline, StableDiffusionGLIGENTextImagePipeline - from .stable_diffusion_ldm3d import StableDiffusionLDM3DPipeline - from .stable_diffusion_panorama import StableDiffusionPanoramaPipeline - from .stable_diffusion_safe import StableDiffusionPipelineSafe - from .stable_diffusion_sag import StableDiffusionSAGPipeline from .stable_diffusion_xl import ( StableDiffusionXLImg2ImgPipeline, StableDiffusionXLInpaintPipeline, @@ -707,25 +711,7 @@ StableDiffusionAdapterPipeline, StableDiffusionXLAdapterPipeline, ) - from .text_to_video_synthesis import ( - TextToVideoSDPipeline, - TextToVideoZeroPipeline, - TextToVideoZeroSDXLPipeline, - VideoToVideoSDPipeline, - ) - from .unclip import UnCLIPImageVariationPipeline, UnCLIPPipeline - from .unidiffuser import ( - ImageTextPipelineOutput, - UniDiffuserModel, - UniDiffuserPipeline, - UniDiffuserTextDecoder, - ) from .wan import WanImageToVideoPipeline, WanPipeline, WanVideoToVideoPipeline - from .wuerstchen import ( - WuerstchenCombinedPipeline, - WuerstchenDecoderPipeline, - WuerstchenPriorPipeline, - ) try: if not is_onnx_available(): @@ -756,7 +742,7 @@ except OptionalDependencyNotAvailable: from ..utils.dummy_torch_and_transformers_and_k_diffusion_objects import * else: - from .stable_diffusion_k_diffusion import ( + from .deprecated import ( StableDiffusionKDiffusionPipeline, StableDiffusionXLKDiffusionPipeline, ) diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index 9eb5fffee7d6..a6a8a20ec231 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -113,12 +113,16 @@ def __getattr__(self, name): "TextToVideoSDPipeline", "TextToVideoZeroPipeline", "TextToVideoZeroSDXLPipeline", + "VideoToVideoSDPipeline", ] _import_structure["unclip"] = [ "UnCLIPPipeline", "UnCLIPImageVariationPipeline", ] _import_structure["unidiffuser"] = [ + "UniDiffuserTextDecoder", + "UniDiffuserModel", + "UTransformer2DModel", "UniDiffuserPipeline", ] _import_structure["versatile_diffusion"] = [ diff --git a/tests/pipelines/controlnet/test_controlnet_blip_diffusion.py b/tests/pipelines/controlnet/test_controlnet_blip_diffusion.py index a5768cb51fbf..07226f36715f 100644 --- a/tests/pipelines/controlnet/test_controlnet_blip_diffusion.py +++ b/tests/pipelines/controlnet/test_controlnet_blip_diffusion.py @@ -28,10 +28,10 @@ PNDMScheduler, UNet2DConditionModel, ) +from diffusers.pipelines.deprecated.blip_diffusion.blip_image_processing import BlipImageProcessor +from diffusers.pipelines.deprecated.blip_diffusion.modeling_blip2 import Blip2QFormerModel +from diffusers.pipelines.deprecated.blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel from diffusers.utils.testing_utils import enable_full_determinism, torch_device -from src.diffusers.pipelines.blip_diffusion.blip_image_processing import BlipImageProcessor -from src.diffusers.pipelines.blip_diffusion.modeling_blip2 import Blip2QFormerModel -from src.diffusers.pipelines.blip_diffusion.modeling_ctx_clip import ContextCLIPTextModel from ..test_pipelines_common import PipelineTesterMixin diff --git a/tests/pipelines/paint_by_example/test_paint_by_example.py b/tests/pipelines/paint_by_example/test_paint_by_example.py index 6b668de2762a..8de89c2195d0 100644 --- a/tests/pipelines/paint_by_example/test_paint_by_example.py +++ b/tests/pipelines/paint_by_example/test_paint_by_example.py @@ -23,7 +23,7 @@ from transformers import CLIPImageProcessor, CLIPVisionConfig from diffusers import AutoencoderKL, PaintByExamplePipeline, PNDMScheduler, UNet2DConditionModel -from diffusers.pipelines.paint_by_example import PaintByExampleImageEncoder +from diffusers.pipelines.deprecated.paint_by_example import PaintByExampleImageEncoder from diffusers.utils.testing_utils import ( enable_full_determinism, floats_tensor, diff --git a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py index 6cd431f02d58..77414bb9a4cb 100644 --- a/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py +++ b/tests/pipelines/semantic_stable_diffusion/test_semantic_diffusion.py @@ -23,7 +23,9 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler, UNet2DConditionModel -from diffusers.pipelines.semantic_stable_diffusion import SemanticStableDiffusionPipeline as StableDiffusionPipeline +from diffusers.pipelines.deprecated.semantic_stable_diffusion import ( + SemanticStableDiffusionPipeline as StableDiffusionPipeline, +) from diffusers.utils.testing_utils import ( enable_full_determinism, floats_tensor, diff --git a/tests/pipelines/shap_e/test_shap_e.py b/tests/pipelines/shap_e/test_shap_e.py index 6cf643fe47a6..64195534c8d8 100644 --- a/tests/pipelines/shap_e/test_shap_e.py +++ b/tests/pipelines/shap_e/test_shap_e.py @@ -20,7 +20,7 @@ from transformers import CLIPTextConfig, CLIPTextModelWithProjection, CLIPTokenizer from diffusers import HeunDiscreteScheduler, PriorTransformer, ShapEPipeline -from diffusers.pipelines.shap_e import ShapERenderer +from diffusers.pipelines.deprecated.shap_e import ShapERenderer from diffusers.utils.testing_utils import load_numpy, nightly, require_torch_gpu, torch_device from ..test_pipelines_common import PipelineTesterMixin, assert_mean_pixel_difference diff --git a/tests/pipelines/shap_e/test_shap_e_img2img.py b/tests/pipelines/shap_e/test_shap_e_img2img.py index 72eee3e35eb1..f3a256b26b53 100644 --- a/tests/pipelines/shap_e/test_shap_e_img2img.py +++ b/tests/pipelines/shap_e/test_shap_e_img2img.py @@ -21,7 +21,7 @@ from transformers import CLIPImageProcessor, CLIPVisionConfig, CLIPVisionModel from diffusers import HeunDiscreteScheduler, PriorTransformer, ShapEImg2ImgPipeline -from diffusers.pipelines.shap_e import ShapERenderer +from diffusers.pipelines.deprecated.shap_e import ShapERenderer from diffusers.utils.testing_utils import ( floats_tensor, load_image, diff --git a/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py b/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py index 269677c08345..20630e7a29bf 100644 --- a/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py +++ b/tests/pipelines/stable_diffusion_safe/test_safe_diffusion.py @@ -23,7 +23,7 @@ from transformers import CLIPTextConfig, CLIPTextModel, CLIPTokenizer from diffusers import AutoencoderKL, DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler, UNet2DConditionModel -from diffusers.pipelines.stable_diffusion_safe import StableDiffusionPipelineSafe as StableDiffusionPipeline +from diffusers.pipelines.deprecated.stable_diffusion_safe import StableDiffusionPipelineSafe as StableDiffusionPipeline from diffusers.utils.testing_utils import floats_tensor, nightly, require_accelerator, require_torch_gpu, torch_device From 605cff153814f4cfab9ebfabd1fe0377dd1d92c9 Mon Sep 17 00:00:00 2001 From: Dhruv Nair Date: Fri, 18 Apr 2025 16:39:03 +0200 Subject: [PATCH 16/32] update --- src/diffusers/pipelines/__init__.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 5f0cd391a7b4..c27fdd0cd424 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -500,7 +500,6 @@ from ..utils.dummy_torch_and_transformers_objects import * else: from .allegro import AllegroPipeline - from .amused import AmusedImg2ImgPipeline, AmusedInpaintPipeline, AmusedPipeline from .animatediff import ( AnimateDiffControlNetPipeline, AnimateDiffPipeline, @@ -509,7 +508,6 @@ AnimateDiffVideoToVideoControlNetPipeline, AnimateDiffVideoToVideoPipeline, ) - from .audioldm import AudioLDMPipeline from .audioldm2 import ( AudioLDM2Pipeline, AudioLDM2ProjectionModel, @@ -539,10 +537,6 @@ HunyuanDiTControlNetPipeline, ) from .controlnet_sd3 import StableDiffusion3ControlNetInpaintingPipeline, StableDiffusion3ControlNetPipeline - from .controlnet_xs import ( - StableDiffusionControlNetXSPipeline, - StableDiffusionXLControlNetXSPipeline, - ) from .deepfloyd_if import ( IFImg2ImgPipeline, IFImg2ImgSuperResolutionPipeline, @@ -554,8 +548,14 @@ from .deprecated import ( AltDiffusionImg2ImgPipeline, AltDiffusionPipeline, + AmusedImg2ImgPipeline, + AmusedInpaintPipeline, + AmusedPipeline, + AudioLDMPipeline, CycleDiffusionPipeline, + I2VGenXLPipeline, PaintByExamplePipeline, + PIAPipeline, StableDiffusionAttendAndExcitePipeline, StableDiffusionControlNetXSPipeline, StableDiffusionDiffEditPipeline, @@ -602,8 +602,6 @@ HunyuanVideoImageToVideoPipeline, HunyuanVideoPipeline, ) - from .hunyuandit import HunyuanDiTPipeline - from .i2vgen_xl import I2VGenXLPipeline from .kandinsky import ( KandinskyCombinedPipeline, KandinskyImg2ImgCombinedPipeline, @@ -650,8 +648,6 @@ MarigoldNormalsPipeline, ) from .mochi import MochiPipeline - from .musicldm import MusicLDMPipeline - from .omnigen import OmniGenPipeline from .pag import ( AnimateDiffPAGPipeline, HunyuanDiTPAGPipeline, @@ -671,8 +667,6 @@ StableDiffusionXLPAGInpaintPipeline, StableDiffusionXLPAGPipeline, ) - from .pia import PIAPipeline - from .pixart_alpha import PixArtAlphaPipeline, PixArtSigmaPipeline from .sana import SanaControlNetPipeline, SanaPipeline, SanaSprintPipeline from .semantic_stable_diffusion import SemanticStableDiffusionPipeline from .shap_e import ShapEImg2ImgPipeline, ShapEPipeline From 1b53d164772253fbcb0a2a7bf7f88fc4f7ce1378 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 12:42:49 +0530 Subject: [PATCH 17/32] update --- src/diffusers/pipelines/deprecated/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index a6a8a20ec231..e517ed9bf572 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -184,6 +184,7 @@ def __getattr__(self, name): else: from .alt_diffusion import AltDiffusionImg2ImgPipeline, AltDiffusionPipeline, AltDiffusionPipelineOutput + from .amused import AmusedImg2ImgPipeline, AmusedInpaintPipeline, AmusedPipeline from .audioldm import AudioLDMPipeline from .blip_diffusion import BlipDiffusionPipeline from .controlnet import BlipDiffusionControlNetPipeline From 0dd33b2db9712b3ba4e78207b1c07294a5375f78 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 13:09:47 +0530 Subject: [PATCH 18/32] update --- src/diffusers/pipelines/deprecated/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index e517ed9bf572..569108f8734a 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -218,6 +218,7 @@ def __getattr__(self, name): TextToVideoSDPipeline, TextToVideoZeroPipeline, TextToVideoZeroSDXLPipeline, + VideoToVideoSDPipeline, ) from .unclip import UnCLIPImageVariationPipeline, UnCLIPPipeline from .unidiffuser import UniDiffuserPipeline From 3a93eb5b4fd96066216d00413ed35e05cd2f55f3 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 13:27:59 +0530 Subject: [PATCH 19/32] update --- src/diffusers/pipelines/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index c27fdd0cd424..fb1ca6ed2c6b 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -554,6 +554,7 @@ AudioLDMPipeline, CycleDiffusionPipeline, I2VGenXLPipeline, + LattePipeline, PaintByExamplePipeline, PIAPipeline, StableDiffusionAttendAndExcitePipeline, @@ -632,7 +633,6 @@ LatentConsistencyModelPipeline, ) from .latent_diffusion import LDMTextToImagePipeline - from .latte import LattePipeline from .ledits_pp import ( LEditsPPDiffusionPipelineOutput, LEditsPPInversionPipelineOutput, From c6947e084967c652e528ada85773b781f8e3252e Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 14:43:43 +0530 Subject: [PATCH 20/32] update --- src/diffusers/pipelines/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index fb1ca6ed2c6b..71298e30f482 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -555,6 +555,7 @@ CycleDiffusionPipeline, I2VGenXLPipeline, LattePipeline, + MusicLDMPipeline, PaintByExamplePipeline, PIAPipeline, StableDiffusionAttendAndExcitePipeline, @@ -568,6 +569,8 @@ StableDiffusionParadigmsPipeline, StableDiffusionPix2PixZeroPipeline, StableDiffusionXLControlNetXSPipeline, + UnCLIPImageVariationPipeline, + UnCLIPPipeline, VersatileDiffusionDualGuidedPipeline, VersatileDiffusionImageVariationPipeline, VersatileDiffusionPipeline, @@ -668,8 +671,6 @@ StableDiffusionXLPAGPipeline, ) from .sana import SanaControlNetPipeline, SanaPipeline, SanaSprintPipeline - from .semantic_stable_diffusion import SemanticStableDiffusionPipeline - from .shap_e import ShapEImg2ImgPipeline, ShapEPipeline from .stable_audio import StableAudioPipeline, StableAudioProjectionModel from .stable_cascade import ( StableCascadeCombinedPipeline, From 4f1ab190bbe95636fb7fa2f626e8f34fade462e6 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 14:48:39 +0530 Subject: [PATCH 21/32] update --- src/diffusers/pipelines/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 71298e30f482..3822f3fe381d 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -552,6 +552,8 @@ AmusedInpaintPipeline, AmusedPipeline, AudioLDMPipeline, + BlipDiffusionControlNetPipeline, + BlipDiffusionPipeline, CycleDiffusionPipeline, I2VGenXLPipeline, LattePipeline, From ee00adec72c95dd63bf5ec68932e4720838a2a9f Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 14:57:36 +0530 Subject: [PATCH 22/32] update --- src/diffusers/pipelines/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 3822f3fe381d..d63c5e2261fd 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -608,6 +608,7 @@ HunyuanVideoImageToVideoPipeline, HunyuanVideoPipeline, ) + from .hunyuandit import HunyuanDiTPipeline from .kandinsky import ( KandinskyCombinedPipeline, KandinskyImg2ImgCombinedPipeline, From 737216c23d1e65d8b02723abfa82669a58e8ee8c Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 15:16:33 +0530 Subject: [PATCH 23/32] update --- src/diffusers/pipelines/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index d63c5e2261fd..8bf566c1ccef 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -556,6 +556,7 @@ BlipDiffusionPipeline, CycleDiffusionPipeline, I2VGenXLPipeline, + ImageTextPipelineOutput, LattePipeline, MusicLDMPipeline, PaintByExamplePipeline, From 09de36c4d881cff52718bd94ba3a4dcb4e0caf37 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 15:33:50 +0530 Subject: [PATCH 24/32] update --- src/diffusers/pipelines/deprecated/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index 569108f8734a..04c76a15e869 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -124,6 +124,7 @@ def __getattr__(self, name): "UniDiffuserModel", "UTransformer2DModel", "UniDiffuserPipeline", + "ImageTextPipelineOutput", ] _import_structure["versatile_diffusion"] = [ "VersatileDiffusionDualGuidedPipeline", @@ -221,7 +222,7 @@ def __getattr__(self, name): VideoToVideoSDPipeline, ) from .unclip import UnCLIPImageVariationPipeline, UnCLIPPipeline - from .unidiffuser import UniDiffuserPipeline + from .unidiffuser import ImageTextPipelineOutput, UniDiffuserPipeline from .versatile_diffusion import ( VersatileDiffusionDualGuidedPipeline, VersatileDiffusionImageVariationPipeline, From 13fb4216b022d6c39805be996743725730d73a7f Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 15:44:18 +0530 Subject: [PATCH 25/32] update --- src/diffusers/pipelines/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 8bf566c1ccef..0ee020ef3889 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -655,6 +655,7 @@ MarigoldNormalsPipeline, ) from .mochi import MochiPipeline + from .omnigen import OmniGenPipeline from .pag import ( AnimateDiffPAGPipeline, HunyuanDiTPAGPipeline, @@ -674,6 +675,7 @@ StableDiffusionXLPAGInpaintPipeline, StableDiffusionXLPAGPipeline, ) + from .pixart_alpha import PixArtAlphaPipeline, PixArtSigmaPipeline from .sana import SanaControlNetPipeline, SanaPipeline, SanaSprintPipeline from .stable_audio import StableAudioPipeline, StableAudioProjectionModel from .stable_cascade import ( From 5929e8b03f62420570a91757d6bab222e6df0016 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 15:52:16 +0530 Subject: [PATCH 26/32] update --- src/diffusers/pipelines/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 0ee020ef3889..b4c5d442e10d 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -561,6 +561,7 @@ MusicLDMPipeline, PaintByExamplePipeline, PIAPipeline, + SemanticStableDiffusionPipeline, StableDiffusionAttendAndExcitePipeline, StableDiffusionControlNetXSPipeline, StableDiffusionDiffEditPipeline, From 8734fc6c63dd8805d833e32abce79d86cbd3be33 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 16:08:00 +0530 Subject: [PATCH 27/32] update --- src/diffusers/pipelines/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index b4c5d442e10d..0f585b5de929 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -562,6 +562,8 @@ PaintByExamplePipeline, PIAPipeline, SemanticStableDiffusionPipeline, + ShapEImg2ImgPipeline, + ShapEPipeline, StableDiffusionAttendAndExcitePipeline, StableDiffusionControlNetXSPipeline, StableDiffusionDiffEditPipeline, From 574a1b047668773514defd1f3ea1ac40f7b9d57a Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 16:34:38 +0530 Subject: [PATCH 28/32] update --- src/diffusers/pipelines/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 0f585b5de929..af300205bad7 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -574,6 +574,7 @@ StableDiffusionPanoramaPipeline, StableDiffusionParadigmsPipeline, StableDiffusionPix2PixZeroPipeline, + StableDiffusionLDM3DPipeline, StableDiffusionXLControlNetXSPipeline, UnCLIPImageVariationPipeline, UnCLIPPipeline, From 3014195c552c45a745a67d70783f9cc29ffa4251 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 16:43:04 +0530 Subject: [PATCH 29/32] update --- src/diffusers/pipelines/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index af300205bad7..b180f11a9e73 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -570,11 +570,12 @@ StableDiffusionGLIGENPipeline, StableDiffusionGLIGENTextImagePipeline, StableDiffusionInpaintPipelineLegacy, + StableDiffusionLDM3DPipeline, StableDiffusionModelEditingPipeline, StableDiffusionPanoramaPipeline, StableDiffusionParadigmsPipeline, + StableDiffusionPipelineSafe, StableDiffusionPix2PixZeroPipeline, - StableDiffusionLDM3DPipeline, StableDiffusionXLControlNetXSPipeline, UnCLIPImageVariationPipeline, UnCLIPPipeline, From 53efae0af25aba61d889591fdf0a7f07c883a23a Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 16:48:17 +0530 Subject: [PATCH 30/32] update --- src/diffusers/pipelines/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index b180f11a9e73..2e9e8f925da7 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -576,6 +576,7 @@ StableDiffusionParadigmsPipeline, StableDiffusionPipelineSafe, StableDiffusionPix2PixZeroPipeline, + StableDiffusionSAGPipeline, StableDiffusionXLControlNetXSPipeline, UnCLIPImageVariationPipeline, UnCLIPPipeline, From 1a25d5491723bcd626ec1fc8acd10f880177ecce Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 17:18:51 +0530 Subject: [PATCH 31/32] update --- docs/source/en/api/attnprocessor.md | 4 ++-- docs/source/en/api/pipelines/i2vgenxl.md | 2 +- docs/source/en/api/pipelines/semantic_stable_diffusion.md | 2 +- docs/source/en/api/pipelines/shap_e.md | 2 +- docs/source/en/api/pipelines/text_to_video.md | 2 +- docs/source/en/api/pipelines/wuerstchen.md | 2 +- src/diffusers/pipelines/__init__.py | 6 ++++++ src/diffusers/pipelines/deprecated/__init__.py | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/docs/source/en/api/attnprocessor.md b/docs/source/en/api/attnprocessor.md index 638ecb973e5d..e9c542da8c8f 100644 --- a/docs/source/en/api/attnprocessor.md +++ b/docs/source/en/api/attnprocessor.md @@ -46,7 +46,7 @@ An attention processor is a class for applying different types of attention mech ## CrossFrameAttnProcessor -[[autodoc]] pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.CrossFrameAttnProcessor +[[autodoc]] pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.CrossFrameAttnProcessor ## Custom Diffusion @@ -163,4 +163,4 @@ An attention processor is a class for applying different types of attention mech ## XLAFluxFlashAttnProcessor2_0 -[[autodoc]] models.attention_processor.XLAFluxFlashAttnProcessor2_0 \ No newline at end of file +[[autodoc]] models.attention_processor.XLAFluxFlashAttnProcessor2_0 diff --git a/docs/source/en/api/pipelines/i2vgenxl.md b/docs/source/en/api/pipelines/i2vgenxl.md index 3994f91d2cd0..00d31d31e753 100644 --- a/docs/source/en/api/pipelines/i2vgenxl.md +++ b/docs/source/en/api/pipelines/i2vgenxl.md @@ -55,4 +55,4 @@ Sample output with I2VGenXL: - __call__ ## I2VGenXLPipelineOutput -[[autodoc]] pipelines.i2vgen_xl.pipeline_i2vgen_xl.I2VGenXLPipelineOutput \ No newline at end of file +[[autodoc]] pipelines.deprecated.i2vgen_xl.pipeline_i2vgen_xl.I2VGenXLPipelineOutput diff --git a/docs/source/en/api/pipelines/semantic_stable_diffusion.md b/docs/source/en/api/pipelines/semantic_stable_diffusion.md index b9aacd3518d8..4e8e5918d991 100644 --- a/docs/source/en/api/pipelines/semantic_stable_diffusion.md +++ b/docs/source/en/api/pipelines/semantic_stable_diffusion.md @@ -31,5 +31,5 @@ Make sure to check out the Schedulers [guide](../../using-diffusers/schedulers) - __call__ ## SemanticStableDiffusionPipelineOutput -[[autodoc]] pipelines.semantic_stable_diffusion.pipeline_output.SemanticStableDiffusionPipelineOutput +[[autodoc]] pipelines.deprecated.semantic_stable_diffusion.pipeline_output.SemanticStableDiffusionPipelineOutput - all diff --git a/docs/source/en/api/pipelines/shap_e.md b/docs/source/en/api/pipelines/shap_e.md index 3c1f939c1fce..fb8f38d98a0a 100644 --- a/docs/source/en/api/pipelines/shap_e.md +++ b/docs/source/en/api/pipelines/shap_e.md @@ -34,4 +34,4 @@ See the [reuse components across pipelines](../../using-diffusers/loading#reuse- - __call__ ## ShapEPipelineOutput -[[autodoc]] pipelines.shap_e.pipeline_shap_e.ShapEPipelineOutput +[[autodoc]] pipelines.deprecated.shap_e.pipeline_shap_e.ShapEPipelineOutput diff --git a/docs/source/en/api/pipelines/text_to_video.md b/docs/source/en/api/pipelines/text_to_video.md index 5eb1dd1a9dbd..7c301bf38c78 100644 --- a/docs/source/en/api/pipelines/text_to_video.md +++ b/docs/source/en/api/pipelines/text_to_video.md @@ -194,4 +194,4 @@ Make sure to check out the Schedulers [guide](../../using-diffusers/schedulers) - __call__ ## TextToVideoSDPipelineOutput -[[autodoc]] pipelines.text_to_video_synthesis.TextToVideoSDPipelineOutput +[[autodoc]] pipelines.deprecated.text_to_video_synthesis.TextToVideoSDPipelineOutput diff --git a/docs/source/en/api/pipelines/wuerstchen.md b/docs/source/en/api/pipelines/wuerstchen.md index da6ef2cffc28..788433fdbd92 100644 --- a/docs/source/en/api/pipelines/wuerstchen.md +++ b/docs/source/en/api/pipelines/wuerstchen.md @@ -145,7 +145,7 @@ The original codebase, as well as experimental ideas, can be found at [dome272/W ## WuerstchenPriorPipelineOutput -[[autodoc]] pipelines.wuerstchen.pipeline_wuerstchen_prior.WuerstchenPriorPipelineOutput +[[autodoc]] pipelines.deprecated.wuerstchen.pipeline_wuerstchen_prior.WuerstchenPriorPipelineOutput ## WuerstchenDecoderPipeline diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 2e9e8f925da7..f78cd34a6627 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -578,8 +578,14 @@ StableDiffusionPix2PixZeroPipeline, StableDiffusionSAGPipeline, StableDiffusionXLControlNetXSPipeline, + TextToVideoSDPipeline, + TextToVideoZeroPipeline, + TextToVideoZeroSDXLPipeline, UnCLIPImageVariationPipeline, UnCLIPPipeline, + UniDiffuserModel, + UniDiffuserPipeline, + UniDiffuserTextDecoder, VersatileDiffusionDualGuidedPipeline, VersatileDiffusionImageVariationPipeline, VersatileDiffusionPipeline, diff --git a/src/diffusers/pipelines/deprecated/__init__.py b/src/diffusers/pipelines/deprecated/__init__.py index 04c76a15e869..0097bf3ff57b 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -222,7 +222,7 @@ def __getattr__(self, name): VideoToVideoSDPipeline, ) from .unclip import UnCLIPImageVariationPipeline, UnCLIPPipeline - from .unidiffuser import ImageTextPipelineOutput, UniDiffuserPipeline + from .unidiffuser import ImageTextPipelineOutput, UniDiffuserModel, UniDiffuserPipeline, UniDiffuserTextDecoder from .versatile_diffusion import ( VersatileDiffusionDualGuidedPipeline, VersatileDiffusionImageVariationPipeline, From 8d6d012b18f7053fe7def809a5461f53dc5e4861 Mon Sep 17 00:00:00 2001 From: DN6 Date: Mon, 21 Apr 2025 19:28:26 +0530 Subject: [PATCH 32/32] update --- docs/source/en/api/models/controlnet_flux.md | 2 +- docs/source/en/api/models/controlnet_sparsectrl.md | 2 +- docs/source/en/api/pipelines/pia.md | 2 +- .../en/api/pipelines/stable_diffusion/ldm3d_diffusion.md | 4 ++-- .../api/pipelines/stable_diffusion/stable_diffusion_safe.md | 2 +- docs/source/en/api/pipelines/text_to_video_zero.md | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/en/api/models/controlnet_flux.md b/docs/source/en/api/models/controlnet_flux.md index 422d066d95ff..a99e8eb38102 100644 --- a/docs/source/en/api/models/controlnet_flux.md +++ b/docs/source/en/api/models/controlnet_flux.md @@ -42,4 +42,4 @@ pipe = FluxControlNetPipeline.from_pretrained("black-forest-labs/FLUX.1-dev", co ## FluxControlNetOutput -[[autodoc]] models.controlnet_flux.FluxControlNetOutput \ No newline at end of file +[[autodoc]] models.controlnets.FluxControlNetOutput diff --git a/docs/source/en/api/models/controlnet_sparsectrl.md b/docs/source/en/api/models/controlnet_sparsectrl.md index d5d7d358c4d2..244269276c97 100644 --- a/docs/source/en/api/models/controlnet_sparsectrl.md +++ b/docs/source/en/api/models/controlnet_sparsectrl.md @@ -43,4 +43,4 @@ controlnet = SparseControlNetModel.from_pretrained("guoyww/animatediff-sparsectr ## SparseControlNetOutput -[[autodoc]] models.controlnet_sparsectrl.SparseControlNetOutput +[[autodoc]] models.controlnets.SparseControlNetOutput diff --git a/docs/source/en/api/pipelines/pia.md b/docs/source/en/api/pipelines/pia.md index 86c0e8eb191a..6d1cf5ac2f86 100644 --- a/docs/source/en/api/pipelines/pia.md +++ b/docs/source/en/api/pipelines/pia.md @@ -168,4 +168,4 @@ FreeInit is not really free - the improved quality comes at the cost of extra co ## PIAPipelineOutput -[[autodoc]] pipelines.pia.PIAPipelineOutput \ No newline at end of file +[[autodoc]] pipelines.deprecated.pia.PIAPipelineOutput diff --git a/docs/source/en/api/pipelines/stable_diffusion/ldm3d_diffusion.md b/docs/source/en/api/pipelines/stable_diffusion/ldm3d_diffusion.md index f2c6ae8f1ddb..de4339836d3f 100644 --- a/docs/source/en/api/pipelines/stable_diffusion/ldm3d_diffusion.md +++ b/docs/source/en/api/pipelines/stable_diffusion/ldm3d_diffusion.md @@ -35,14 +35,14 @@ Make sure to check out the Stable Diffusion [Tips](overview#tips) section to lea ## StableDiffusionLDM3DPipeline -[[autodoc]] pipelines.stable_diffusion_ldm3d.pipeline_stable_diffusion_ldm3d.StableDiffusionLDM3DPipeline +[[autodoc]] pipelines.deprecated.stable_diffusion_ldm3d.pipeline_stable_diffusion_ldm3d.StableDiffusionLDM3DPipeline - all - __call__ ## LDM3DPipelineOutput -[[autodoc]] pipelines.stable_diffusion_ldm3d.pipeline_stable_diffusion_ldm3d.LDM3DPipelineOutput +[[autodoc]] pipelines.deprecated.stable_diffusion_ldm3d.pipeline_stable_diffusion_ldm3d.LDM3DPipelineOutput - all - __call__ diff --git a/docs/source/en/api/pipelines/stable_diffusion/stable_diffusion_safe.md b/docs/source/en/api/pipelines/stable_diffusion/stable_diffusion_safe.md index 97c11bfe23bb..b80cca290bd7 100644 --- a/docs/source/en/api/pipelines/stable_diffusion/stable_diffusion_safe.md +++ b/docs/source/en/api/pipelines/stable_diffusion/stable_diffusion_safe.md @@ -56,6 +56,6 @@ Make sure to check out the Stable Diffusion [Tips](overview#tips) section to lea ## StableDiffusionSafePipelineOutput -[[autodoc]] pipelines.stable_diffusion_safe.StableDiffusionSafePipelineOutput +[[autodoc]] pipelines.deprecated.stable_diffusion_safe.StableDiffusionSafePipelineOutput - all - __call__ diff --git a/docs/source/en/api/pipelines/text_to_video_zero.md b/docs/source/en/api/pipelines/text_to_video_zero.md index 44d9a6670af4..e1d95b66d057 100644 --- a/docs/source/en/api/pipelines/text_to_video_zero.md +++ b/docs/source/en/api/pipelines/text_to_video_zero.md @@ -303,4 +303,4 @@ Make sure to check out the Schedulers [guide](../../using-diffusers/schedulers) - __call__ ## TextToVideoPipelineOutput -[[autodoc]] pipelines.text_to_video_synthesis.pipeline_text_to_video_zero.TextToVideoPipelineOutput +[[autodoc]] pipelines.deprecated.text_to_video_synthesis.pipeline_text_to_video_zero.TextToVideoPipelineOutput