Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
chenpangpang
diffusers
Commits
bffadde1
Unverified
Commit
bffadde1
authored
Dec 21, 2023
by
Sayak Paul
Committed by
GitHub
Dec 21, 2023
Browse files
[Refactor] move k diffusion out of stable_diffusion (#6267)
move k diffusion out of stable_diffusion
parent
35a969d2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
33 deletions
+63
-33
src/diffusers/pipelines/__init__.py
src/diffusers/pipelines/__init__.py
+2
-2
src/diffusers/pipelines/stable_diffusion/__init__.py
src/diffusers/pipelines/stable_diffusion/__init__.py
+0
-30
src/diffusers/pipelines/stable_diffusion_k_diffusion/__init__.py
...fusers/pipelines/stable_diffusion_k_diffusion/__init__.py
+60
-0
src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py
...sion_k_diffusion/pipeline_stable_diffusion_k_diffusion.py
+1
-1
No files found.
src/diffusers/pipelines/__init__.py
View file @
bffadde1
...
@@ -268,7 +268,7 @@ except OptionalDependencyNotAvailable:
...
@@ -268,7 +268,7 @@ except OptionalDependencyNotAvailable:
_dummy_objects
.
update
(
get_objects_from_module
(
dummy_torch_and_transformers_and_k_diffusion_objects
))
_dummy_objects
.
update
(
get_objects_from_module
(
dummy_torch_and_transformers_and_k_diffusion_objects
))
else
:
else
:
_import_structure
[
"stable_diffusion
"
].
extend
(
[
"StableDiffusionKDiffusionPipeline"
]
)
_import_structure
[
"stable_diffusion
_k_diffusion"
]
=
[
"StableDiffusionKDiffusionPipeline"
]
try
:
try
:
if
not
is_flax_available
():
if
not
is_flax_available
():
raise
OptionalDependencyNotAvailable
()
raise
OptionalDependencyNotAvailable
()
...
@@ -498,7 +498,7 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
...
@@ -498,7 +498,7 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
except
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
:
else
:
from
.stable_diffusion
import
StableDiffusionKDiffusionPipeline
from
.stable_diffusion
_k_diffusion
import
StableDiffusionKDiffusionPipeline
try
:
try
:
if
not
is_flax_available
():
if
not
is_flax_available
():
...
...
src/diffusers/pipelines/stable_diffusion/__init__.py
View file @
bffadde1
...
@@ -79,22 +79,7 @@ except OptionalDependencyNotAvailable:
...
@@ -79,22 +79,7 @@ except OptionalDependencyNotAvailable:
else
:
else
:
_import_structure
[
"pipeline_stable_diffusion_depth2img"
]
=
[
"StableDiffusionDepth2ImgPipeline"
]
_import_structure
[
"pipeline_stable_diffusion_depth2img"
]
=
[
"StableDiffusionDepth2ImgPipeline"
]
_import_structure
[
"pipeline_stable_diffusion_pix2pix_zero"
]
=
[
"StableDiffusionPix2PixZeroPipeline"
]
_import_structure
[
"pipeline_stable_diffusion_pix2pix_zero"
]
=
[
"StableDiffusionPix2PixZeroPipeline"
]
try
:
if
not
(
is_torch_available
()
and
is_transformers_available
()
and
is_k_diffusion_available
()
and
is_k_diffusion_version
(
">="
,
"0.0.12"
)
):
raise
OptionalDependencyNotAvailable
()
except
OptionalDependencyNotAvailable
:
from
...utils
import
(
dummy_torch_and_transformers_and_k_diffusion_objects
,
)
_dummy_objects
.
update
(
get_objects_from_module
(
dummy_torch_and_transformers_and_k_diffusion_objects
))
else
:
_import_structure
[
"pipeline_stable_diffusion_k_diffusion"
]
=
[
"StableDiffusionKDiffusionPipeline"
]
try
:
try
:
if
not
(
is_transformers_available
()
and
is_onnx_available
()):
if
not
(
is_transformers_available
()
and
is_onnx_available
()):
raise
OptionalDependencyNotAvailable
()
raise
OptionalDependencyNotAvailable
()
...
@@ -185,21 +170,6 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
...
@@ -185,21 +170,6 @@ if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
StableDiffusionDepth2ImgPipeline
,
StableDiffusionDepth2ImgPipeline
,
)
)
try
:
if
not
(
is_torch_available
()
and
is_transformers_available
()
and
is_k_diffusion_available
()
and
is_k_diffusion_version
(
">="
,
"0.0.12"
)
):
raise
OptionalDependencyNotAvailable
()
except
OptionalDependencyNotAvailable
:
from
...utils.dummy_torch_and_transformers_and_k_diffusion_objects
import
*
else
:
from
.pipeline_stable_diffusion_k_diffusion
import
(
StableDiffusionKDiffusionPipeline
,
)
try
:
try
:
if
not
(
is_transformers_available
()
and
is_onnx_available
()):
if
not
(
is_transformers_available
()
and
is_onnx_available
()):
raise
OptionalDependencyNotAvailable
()
raise
OptionalDependencyNotAvailable
()
...
...
src/diffusers/pipelines/stable_diffusion_k_diffusion/__init__.py
0 → 100644
View file @
bffadde1
from
typing
import
TYPE_CHECKING
from
...utils
import
(
DIFFUSERS_SLOW_IMPORT
,
OptionalDependencyNotAvailable
,
_LazyModule
,
get_objects_from_module
,
is_k_diffusion_available
,
is_k_diffusion_version
,
is_torch_available
,
is_transformers_available
,
)
_dummy_objects
=
{}
_import_structure
=
{}
try
:
if
not
(
is_transformers_available
()
and
is_torch_available
()
and
is_k_diffusion_available
()
and
is_k_diffusion_version
(
">="
,
"0.0.12"
)
):
raise
OptionalDependencyNotAvailable
()
except
OptionalDependencyNotAvailable
:
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
:
_import_structure
[
"pipeline_stable_diffusion_k_diffusion"
]
=
[
"StableDiffusionKDiffusionPipeline"
]
if
TYPE_CHECKING
or
DIFFUSERS_SLOW_IMPORT
:
try
:
if
not
(
is_transformers_available
()
and
is_torch_available
()
and
is_k_diffusion_available
()
and
is_k_diffusion_version
(
">="
,
"0.0.12"
)
):
raise
OptionalDependencyNotAvailable
()
except
OptionalDependencyNotAvailable
:
from
...utils.dummy_torch_and_transformers_and_k_diffusion_objects
import
*
else
:
from
.pipeline_stable_diffusion_k_diffusion
import
StableDiffusionKDiffusionPipeline
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
)
src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_k_diffusion.py
→
src/diffusers/pipelines/stable_diffusion
_k_diffusion
/pipeline_stable_diffusion_k_diffusion.py
View file @
bffadde1
...
@@ -27,7 +27,7 @@ from ...schedulers import LMSDiscreteScheduler
...
@@ -27,7 +27,7 @@ from ...schedulers import LMSDiscreteScheduler
from
...utils
import
USE_PEFT_BACKEND
,
deprecate
,
logging
,
scale_lora_layers
,
unscale_lora_layers
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
from
..pipeline_utils
import
DiffusionPipeline
from
.
import
StableDiffusionPipelineOutput
from
.
.stable_diffusion
import
StableDiffusionPipelineOutput
logger
=
logging
.
get_logger
(
__name__
)
# pylint: disable=invalid-name
logger
=
logging
.
get_logger
(
__name__
)
# pylint: disable=invalid-name
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment