Unverified Commit 6269045c authored by Sayak Paul's avatar Sayak Paul Committed by GitHub
Browse files

[Refactor] move diffedit out of stable_diffusion (#6260)

* move diffedit out of stable_diffuson

* fix: import

* style

* fix: import
parent 6ca9c4af
...@@ -181,7 +181,6 @@ else: ...@@ -181,7 +181,6 @@ else:
"CLIPImageProjection", "CLIPImageProjection",
"StableDiffusionAttendAndExcitePipeline", "StableDiffusionAttendAndExcitePipeline",
"StableDiffusionDepth2ImgPipeline", "StableDiffusionDepth2ImgPipeline",
"StableDiffusionDiffEditPipeline",
"StableDiffusionGLIGENPipeline", "StableDiffusionGLIGENPipeline",
"StableDiffusionGLIGENPipeline", "StableDiffusionGLIGENPipeline",
"StableDiffusionGLIGENTextImagePipeline", "StableDiffusionGLIGENTextImagePipeline",
...@@ -209,6 +208,7 @@ else: ...@@ -209,6 +208,7 @@ else:
"StableDiffusionXLPipeline", "StableDiffusionXLPipeline",
] ]
) )
_import_structure["stable_diffusion_diffedit"] = ["StableDiffusionDiffEditPipeline"]
_import_structure["t2i_adapter"] = [ _import_structure["t2i_adapter"] = [
"StableDiffusionAdapterPipeline", "StableDiffusionAdapterPipeline",
"StableDiffusionXLAdapterPipeline", "StableDiffusionXLAdapterPipeline",
...@@ -422,7 +422,6 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: ...@@ -422,7 +422,6 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
CLIPImageProjection, CLIPImageProjection,
StableDiffusionAttendAndExcitePipeline, StableDiffusionAttendAndExcitePipeline,
StableDiffusionDepth2ImgPipeline, StableDiffusionDepth2ImgPipeline,
StableDiffusionDiffEditPipeline,
StableDiffusionGLIGENPipeline, StableDiffusionGLIGENPipeline,
StableDiffusionGLIGENTextImagePipeline, StableDiffusionGLIGENTextImagePipeline,
StableDiffusionImageVariationPipeline, StableDiffusionImageVariationPipeline,
...@@ -438,6 +437,7 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: ...@@ -438,6 +437,7 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
StableUnCLIPImg2ImgPipeline, StableUnCLIPImg2ImgPipeline,
StableUnCLIPPipeline, StableUnCLIPPipeline,
) )
from .stable_diffusion_diffedit import StableDiffusionDiffEditPipeline
from .stable_diffusion_safe import StableDiffusionPipelineSafe from .stable_diffusion_safe import StableDiffusionPipelineSafe
from .stable_diffusion_xl import ( from .stable_diffusion_xl import (
StableDiffusionXLImg2ImgPipeline, StableDiffusionXLImg2ImgPipeline,
......
...@@ -67,20 +67,17 @@ try: ...@@ -67,20 +67,17 @@ try:
except OptionalDependencyNotAvailable: except OptionalDependencyNotAvailable:
from ...utils.dummy_torch_and_transformers_objects import ( from ...utils.dummy_torch_and_transformers_objects import (
StableDiffusionDepth2ImgPipeline, StableDiffusionDepth2ImgPipeline,
StableDiffusionDiffEditPipeline,
StableDiffusionPix2PixZeroPipeline, StableDiffusionPix2PixZeroPipeline,
) )
_dummy_objects.update( _dummy_objects.update(
{ {
"StableDiffusionDepth2ImgPipeline": StableDiffusionDepth2ImgPipeline, "StableDiffusionDepth2ImgPipeline": StableDiffusionDepth2ImgPipeline,
"StableDiffusionDiffEditPipeline": StableDiffusionDiffEditPipeline,
"StableDiffusionPix2PixZeroPipeline": StableDiffusionPix2PixZeroPipeline, "StableDiffusionPix2PixZeroPipeline": StableDiffusionPix2PixZeroPipeline,
} }
) )
else: else:
_import_structure["pipeline_stable_diffusion_depth2img"] = ["StableDiffusionDepth2ImgPipeline"] _import_structure["pipeline_stable_diffusion_depth2img"] = ["StableDiffusionDepth2ImgPipeline"]
_import_structure["pipeline_stable_diffusion_diffedit"] = ["StableDiffusionDiffEditPipeline"]
_import_structure["pipeline_stable_diffusion_pix2pix_zero"] = ["StableDiffusionPix2PixZeroPipeline"] _import_structure["pipeline_stable_diffusion_pix2pix_zero"] = ["StableDiffusionPix2PixZeroPipeline"]
try: try:
if not ( if not (
...@@ -181,14 +178,12 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT: ...@@ -181,14 +178,12 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
except OptionalDependencyNotAvailable: except OptionalDependencyNotAvailable:
from ...utils.dummy_torch_and_transformers_objects import ( from ...utils.dummy_torch_and_transformers_objects import (
StableDiffusionDepth2ImgPipeline, StableDiffusionDepth2ImgPipeline,
StableDiffusionDiffEditPipeline,
StableDiffusionPix2PixZeroPipeline, StableDiffusionPix2PixZeroPipeline,
) )
else: else:
from .pipeline_stable_diffusion_depth2img import ( from .pipeline_stable_diffusion_depth2img import (
StableDiffusionDepth2ImgPipeline, StableDiffusionDepth2ImgPipeline,
) )
from .pipeline_stable_diffusion_diffedit import StableDiffusionDiffEditPipeline
try: try:
if not ( if not (
......
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_stable_diffusion_diffedit"] = ["StableDiffusionDiffEditPipeline"]
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_stable_diffusion_diffedit import StableDiffusionDiffEditPipeline
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)
...@@ -40,8 +40,8 @@ from ...utils import ( ...@@ -40,8 +40,8 @@ from ...utils import (
) )
from ...utils.torch_utils import randn_tensor from ...utils.torch_utils import randn_tensor
from ..pipeline_utils import DiffusionPipeline from ..pipeline_utils import DiffusionPipeline
from . import StableDiffusionPipelineOutput from ..stable_diffusion import StableDiffusionPipelineOutput
from .safety_checker import StableDiffusionSafetyChecker from ..stable_diffusion.safety_checker import StableDiffusionSafetyChecker
logger = logging.get_logger(__name__) # pylint: disable=invalid-name logger = logging.get_logger(__name__) # pylint: disable=invalid-name
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment