From bcecfbc873f9041bb5f57495640bfa5e6dc74976 Mon Sep 17 00:00:00 2001 From: sayakpaul Date: Thu, 21 Dec 2023 12:35:09 +0530 Subject: [PATCH] move attend and excite out of stable_diffusion --- src/diffusers/pipelines/__init__.py | 4 ++-- src/diffusers/pipelines/stable_diffusion/__init__.py | 4 ---- .../__init__.py | 4 ++-- .../pipeline_stable_diffusion_attend_and_excite.py | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) rename src/diffusers/pipelines/{stable_diffusion_diffedit => stable_diffusion_attend_and_excite}/__init__.py (84%) rename src/diffusers/pipelines/{stable_diffusion => stable_diffusion_attend_and_excite}/pipeline_stable_diffusion_attend_and_excite.py (99%) diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index e760355ff7..72e72f1772 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -179,7 +179,6 @@ else: _import_structure["stable_diffusion"].extend( [ "CLIPImageProjection", - "StableDiffusionAttendAndExcitePipeline", "StableDiffusionDepth2ImgPipeline", "StableDiffusionGLIGENPipeline", "StableDiffusionGLIGENPipeline", @@ -209,6 +208,7 @@ else: ] ) _import_structure["stable_diffusion_diffedit"] = ["StableDiffusionDiffEditPipeline"] + _import_structure["stable_diffusion_attend_and_excite"] = ["StableDiffusionAttendAndExcitePipeline"] _import_structure["t2i_adapter"] = [ "StableDiffusionAdapterPipeline", "StableDiffusionXLAdapterPipeline", @@ -420,7 +420,6 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: from .shap_e import ShapEImg2ImgPipeline, ShapEPipeline from .stable_diffusion import ( CLIPImageProjection, - StableDiffusionAttendAndExcitePipeline, StableDiffusionDepth2ImgPipeline, StableDiffusionGLIGENPipeline, StableDiffusionGLIGENTextImagePipeline, @@ -437,6 +436,7 @@ 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 085b46beff..40e3680010 100644 --- a/src/diffusers/pipelines/stable_diffusion/__init__.py +++ b/src/diffusers/pipelines/stable_diffusion/__init__.py @@ -32,7 +32,6 @@ 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"] @@ -136,9 +135,6 @@ 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_diffedit/__init__.py b/src/diffusers/pipelines/stable_diffusion_attend_and_excite/__init__.py similarity index 84% rename from src/diffusers/pipelines/stable_diffusion_diffedit/__init__.py rename to src/diffusers/pipelines/stable_diffusion_attend_and_excite/__init__.py index e2145edb96..cce556fceb 100644 --- a/src/diffusers/pipelines/stable_diffusion_diffedit/__init__.py +++ b/src/diffusers/pipelines/stable_diffusion_attend_and_excite/__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_diffedit"] = ["StableDiffusionDiffEditPipeline"] + _import_structure["pipeline_stable_diffusion_attend_and_excite"] = ["StableDiffusionAttendAndExcitePipeline"] 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_diffedit import StableDiffusionDiffEditPipeline + from .pipeline_stable_diffusion_attend_and_excite import StableDiffusionAttendAndExcitePipeline else: import sys diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_attend_and_excite.py b/src/diffusers/pipelines/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py similarity index 99% rename from src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_attend_and_excite.py rename to src/diffusers/pipelines/stable_diffusion_attend_and_excite/pipeline_stable_diffusion_attend_and_excite.py index 78023f544e..401c45c23b 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_attend_and_excite.py +++ b/src/diffusers/pipelines/stable_diffusion_attend_and_excite/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 . import StableDiffusionPipelineOutput -from .safety_checker import StableDiffusionSafetyChecker +from ..stable_diffusion import StableDiffusionPipelineOutput +from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker logger = logging.get_logger(__name__)