From c5ff469d0ea7161c6166d4bad9741b60725baf3f Mon Sep 17 00:00:00 2001 From: sayakpaul Date: Thu, 21 Dec 2023 12:35:58 +0530 Subject: [PATCH] Revert "move attend and excite out of stable_diffusion" This reverts commit bcecfbc873f9041bb5f57495640bfa5e6dc74976. --- src/diffusers/pipelines/__init__.py | 4 ++-- src/diffusers/pipelines/stable_diffusion/__init__.py | 4 ++++ .../pipeline_stable_diffusion_attend_and_excite.py | 4 ++-- .../__init__.py | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) rename src/diffusers/pipelines/{stable_diffusion_attend_and_excite => stable_diffusion}/pipeline_stable_diffusion_attend_and_excite.py (99%) rename src/diffusers/pipelines/{stable_diffusion_attend_and_excite => stable_diffusion_diffedit}/__init__.py (84%) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index 72e72f1772..e760355ff7 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -179,6 +179,7 @@ else: _import_structure["stable_diffusion"].extend( [ "CLIPImageProjection", + "StableDiffusionAttendAndExcitePipeline", "StableDiffusionDepth2ImgPipeline", "StableDiffusionGLIGENPipeline", "StableDiffusionGLIGENPipeline", @@ -208,7 +209,6 @@ else: ] ) _import_structure["stable_diffusion_diffedit"] = ["StableDiffusionDiffEditPipeline"] - _import_structure["stable_diffusion_attend_and_excite"] = ["StableDiffusionAttendAndExcitePipeline"] _import_structure["t2i_adapter"] = [ "StableDiffusionAdapterPipeline", "StableDiffusionXLAdapterPipeline", @@ -420,6 +420,7 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: from .shap_e import ShapEImg2ImgPipeline, ShapEPipeline from .stable_diffusion import ( CLIPImageProjection, + StableDiffusionAttendAndExcitePipeline, StableDiffusionDepth2ImgPipeline, StableDiffusionGLIGENPipeline, StableDiffusionGLIGENTextImagePipeline, @@ -436,7 +437,6 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: StableUnCLIPImg2ImgPipeline, StableUnCLIPPipeline, ) - from .stable_diffusion_attend_and_excite import StableDiffusionAttendAndExcitePipeline from .stable_diffusion_diffedit import StableDiffusionDiffEditPipeline from .stable_diffusion_safe import StableDiffusionPipelineSafe from .stable_diffusion_xl import ( diff --git a/src/diffusers/pipelines/stable_diffusion/__init__.py b/src/diffusers/pipelines/stable_diffusion/__init__.py index 40e3680010..085b46beff 100644 --- a/src/diffusers/pipelines/stable_diffusion/__init__.py +++ b/src/diffusers/pipelines/stable_diffusion/__init__.py @@ -32,6 +32,7 @@ else: _import_structure["clip_image_project_model"] = ["CLIPImageProjection"] _import_structure["pipeline_cycle_diffusion"] = ["CycleDiffusionPipeline"] _import_structure["pipeline_stable_diffusion"] = ["StableDiffusionPipeline"] + _import_structure["pipeline_stable_diffusion_attend_and_excite"] = ["StableDiffusionAttendAndExcitePipeline"] _import_structure["pipeline_stable_diffusion_gligen"] = ["StableDiffusionGLIGENPipeline"] _import_structure["pipeline_stable_diffusion_gligen_text_image"] = ["StableDiffusionGLIGENTextImagePipeline"] _import_structure["pipeline_stable_diffusion_img2img"] = ["StableDiffusionImg2ImgPipeline"] @@ -135,6 +136,9 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: StableDiffusionPipelineOutput, StableDiffusionSafetyChecker, ) + from .pipeline_stable_diffusion_attend_and_excite import ( + StableDiffusionAttendAndExcitePipeline, + ) from .pipeline_stable_diffusion_gligen import StableDiffusionGLIGENPipeline from .pipeline_stable_diffusion_gligen_text_image import ( StableDiffusionGLIGENTextImagePipeline, diff --git a/src/diffusers/pipelines/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py b/src/diffusers/pipelines/stable_diffusion/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/stable_diffusion/pipeline_stable_diffusion_attend_and_excite.py index 401c45c23b..78023f544e 100644 --- a/src/diffusers/pipelines/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_attend_and_excite.py @@ -37,8 +37,8 @@ from ...utils import ( ) 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 . import StableDiffusionPipelineOutput +from .safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__) diff --git a/src/diffusers/pipelines/stable_diffusion_attend_and_excite/__init__.py b/src/diffusers/pipelines/stable_diffusion_diffedit/__init__.py similarity index 84% rename from src/diffusers/pipelines/stable_diffusion_attend_and_excite/__init__.py rename to src/diffusers/pipelines/stable_diffusion_diffedit/__init__.py index cce556fceb..e2145edb96 100644 --- a/src/diffusers/pipelines/stable_diffusion_attend_and_excite/__init__.py +++ b/src/diffusers/pipelines/stable_diffusion_diffedit/__init__.py @@ -22,7 +22,7 @@ except OptionalDependencyNotAvailable: _dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects)) else: - _import_structure["pipeline_stable_diffusion_attend_and_excite"] = ["StableDiffusionAttendAndExcitePipeline"] + _import_structure["pipeline_stable_diffusion_diffedit"] = ["StableDiffusionDiffEditPipeline"] if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: try: @@ -32,7 +32,7 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: except OptionalDependencyNotAvailable: from ...utils.dummy_torch_and_transformers_objects import * else: - from .pipeline_stable_diffusion_attend_and_excite import StableDiffusionAttendAndExcitePipeline + from .pipeline_stable_diffusion_diffedit import StableDiffusionDiffEditPipeline else: import sys