diff --git a/src/diffusers/pipelines/__init__.py b/src/diffusers/pipelines/__init__.py index f58fff3377..6fdcdf1f53 100644 --- a/src/diffusers/pipelines/__init__.py +++ b/src/diffusers/pipelines/__init__.py @@ -149,6 +149,8 @@ else: "WuerstchenCombinedPipeline", "WuerstchenDecoderPipeline", "WuerstchenPriorPipeline", + "BlipDiffusionPipeline", + "BlipDiffusionControlNetPipeline", ] ) _import_structure["allegro"] = ["AllegroPipeline"] @@ -180,7 +182,6 @@ else: "AudioLDM2ProjectionModel", "AudioLDM2UNet2DConditionModel", ] - _import_structure["blip_diffusion"] = ["BlipDiffusionPipeline"] _import_structure["cogvideo"] = [ "CogVideoXPipeline", "CogVideoXImageToVideoPipeline", @@ -191,7 +192,6 @@ else: _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 84cbd55dc1..7bc85375f7 100644 --- a/src/diffusers/pipelines/deprecated/__init__.py +++ b/src/diffusers/pipelines/deprecated/__init__.py @@ -76,6 +76,8 @@ else: "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 af6c879d5c..d6bd9b7c83 100644 --- a/src/diffusers/pipelines/blip_diffusion/__init__.py +++ b/src/diffusers/pipelines/deprecated/blip_diffusion/__init__.py @@ -5,7 +5,7 @@ import numpy as np 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 cbd8bef679..6f467d339d 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 PIL.Image 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 0000000000..0522c6994c --- /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 88c387d48d..b3462a7402 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 PIL.Image 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():