Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
renzhc
diffusers_dcu
Commits
35d81861
Unverified
Commit
35d81861
authored
Nov 24, 2022
by
Patrick von Platen
Committed by
GitHub
Nov 24, 2022
Browse files
[Bad dependencies] Fix imports (#1382)
* fix imports * better error * up * finish
parent
15241225
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
4 deletions
+48
-4
src/diffusers/pipelines/stable_diffusion/__init__.py
src/diffusers/pipelines/stable_diffusion/__init__.py
+13
-2
src/diffusers/pipelines/versatile_diffusion/__init__.py
src/diffusers/pipelines/versatile_diffusion/__init__.py
+9
-2
src/diffusers/utils/__init__.py
src/diffusers/utils/__init__.py
+1
-0
src/diffusers/utils/import_utils.py
src/diffusers/utils/import_utils.py
+25
-0
No files found.
src/diffusers/pipelines/stable_diffusion/__init__.py
View file @
35d81861
...
...
@@ -6,7 +6,14 @@ import numpy as np
import
PIL
from
PIL
import
Image
from
...utils
import
BaseOutput
,
is_flax_available
,
is_onnx_available
,
is_torch_available
,
is_transformers_available
from
...utils
import
(
BaseOutput
,
is_flax_available
,
is_onnx_available
,
is_torch_available
,
is_transformers_available
,
is_transformers_version
,
)
@
dataclass
...
...
@@ -30,12 +37,16 @@ class StableDiffusionPipelineOutput(BaseOutput):
if
is_transformers_available
()
and
is_torch_available
():
from
.pipeline_cycle_diffusion
import
CycleDiffusionPipeline
from
.pipeline_stable_diffusion
import
StableDiffusionPipeline
from
.pipeline_stable_diffusion_image_variation
import
StableDiffusionImageVariationPipeline
from
.pipeline_stable_diffusion_img2img
import
StableDiffusionImg2ImgPipeline
from
.pipeline_stable_diffusion_inpaint
import
StableDiffusionInpaintPipeline
from
.pipeline_stable_diffusion_inpaint_legacy
import
StableDiffusionInpaintPipelineLegacy
from
.safety_checker
import
StableDiffusionSafetyChecker
if
is_transformers_available
()
and
is_torch_available
()
and
is_transformers_version
(
">="
,
"4.25.0"
):
from
.pipeline_stable_diffusion_image_variation
import
StableDiffusionImageVariationPipeline
else
:
from
...utils.dummy_torch_and_transformers_objects
import
StableDiffusionImageVariationPipeline
if
is_transformers_available
()
and
is_onnx_available
():
from
.pipeline_onnx_stable_diffusion
import
OnnxStableDiffusionPipeline
,
StableDiffusionOnnxPipeline
from
.pipeline_onnx_stable_diffusion_img2img
import
OnnxStableDiffusionImg2ImgPipeline
...
...
src/diffusers/pipelines/versatile_diffusion/__init__.py
View file @
35d81861
from
...utils
import
is_torch_available
,
is_transformers_available
from
...utils
import
is_torch_available
,
is_transformers_available
,
is_transformers_version
if
is_transformers_available
()
and
is_torch_available
():
if
is_transformers_available
()
and
is_torch_available
()
and
is_transformers_version
(
">="
,
"4.25.0"
)
:
from
.modeling_text_unet
import
UNetFlatConditionModel
from
.pipeline_versatile_diffusion
import
VersatileDiffusionPipeline
from
.pipeline_versatile_diffusion_dual_guided
import
VersatileDiffusionDualGuidedPipeline
from
.pipeline_versatile_diffusion_image_variation
import
VersatileDiffusionImageVariationPipeline
from
.pipeline_versatile_diffusion_text_to_image
import
VersatileDiffusionTextToImagePipeline
else
:
from
...utils.dummy_torch_and_transformers_objects
import
(
VersatileDiffusionDualGuidedPipeline
,
VersatileDiffusionImageVariationPipeline
,
VersatileDiffusionPipeline
,
VersatileDiffusionTextToImagePipeline
,
)
src/diffusers/utils/__init__.py
View file @
35d81861
...
...
@@ -33,6 +33,7 @@ from .import_utils import (
is_torch_available
,
is_torch_version
,
is_transformers_available
,
is_transformers_version
,
is_unidecode_available
,
requires_backends
,
)
...
...
src/diffusers/utils/import_utils.py
View file @
35d81861
...
...
@@ -303,6 +303,17 @@ def requires_backends(obj, backends):
if
failed
:
raise
ImportError
(
""
.
join
(
failed
))
if
name
in
[
"VersatileDiffusionTextToImagePipeline"
,
"VersatileDiffusionPipeline"
,
"VersatileDiffusionDualGuidedPipeline"
,
"StableDiffusionImageVariationPipeline"
,
]
and
is_transformers_version
(
"<"
,
"4.25.0"
):
raise
ImportError
(
f
"You need to install `transformers` from 'main' in order to use
{
name
}
:
\n
```
\n
pip install"
" git+https://github.com/huggingface/transformers
\n
```"
)
class
DummyObject
(
type
):
"""
...
...
@@ -347,3 +358,17 @@ def is_torch_version(operation: str, version: str):
A string version of PyTorch
"""
return
compare_versions
(
parse
(
_torch_version
),
operation
,
version
)
def
is_transformers_version
(
operation
:
str
,
version
:
str
):
"""
Args:
Compares the current Transformers version to a given reference with an operation.
operation (`str`):
A string representation of an operator, such as `">"` or `"<="`
version (`str`):
A string version of PyTorch
"""
if
not
_transformers_available
:
return
False
return
compare_versions
(
parse
(
_transformers_version
),
operation
,
version
)
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