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
7e29b747
Unverified
Commit
7e29b747
authored
Jan 17, 2023
by
Pedro Cuenca
Committed by
GitHub
Jan 17, 2023
Browse files
Check k-diffusion version is at least 0.0.12 (#2022)
* Check k-diffusion version is at least 0.0.12 * make style
parent
a43bdd01
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
5 deletions
+22
-5
setup.py
setup.py
+1
-1
src/diffusers/__init__.py
src/diffusers/__init__.py
+1
-0
src/diffusers/dependency_versions_table.py
src/diffusers/dependency_versions_table.py
+2
-2
src/diffusers/pipelines/stable_diffusion/__init__.py
src/diffusers/pipelines/stable_diffusion/__init__.py
+2
-1
src/diffusers/utils/__init__.py
src/diffusers/utils/__init__.py
+1
-0
src/diffusers/utils/import_utils.py
src/diffusers/utils/import_utils.py
+15
-1
No files found.
setup.py
View file @
7e29b747
...
...
@@ -91,7 +91,7 @@ _deps = [
"isort>=5.5.4"
,
"jax>=0.2.8,!=0.3.2"
,
"jaxlib>=0.1.65"
,
"k-diffusion"
,
"k-diffusion
>=0.0.12
"
,
"librosa"
,
"modelcards>=0.1.4"
,
"numpy"
,
...
...
src/diffusers/__init__.py
View file @
7e29b747
...
...
@@ -6,6 +6,7 @@ from .utils import (
is_flax_available
,
is_inflect_available
,
is_k_diffusion_available
,
is_k_diffusion_version
,
is_librosa_available
,
is_onnx_available
,
is_scipy_available
,
...
...
src/diffusers/dependency_versions_table.py
View file @
7e29b747
...
...
@@ -4,7 +4,7 @@
deps
=
{
"Pillow"
:
"Pillow"
,
"accelerate"
:
"accelerate>=0.11.0"
,
"black"
:
"black==22.
8
"
,
"black"
:
"black==22.
12
"
,
"datasets"
:
"datasets"
,
"filelock"
:
"filelock"
,
"flake8"
:
"flake8>=3.8.3"
,
...
...
@@ -15,7 +15,7 @@ deps = {
"isort"
:
"isort>=5.5.4"
,
"jax"
:
"jax>=0.2.8,!=0.3.2"
,
"jaxlib"
:
"jaxlib>=0.1.65"
,
"k-diffusion"
:
"k-diffusion"
,
"k-diffusion"
:
"k-diffusion
>=0.0.12
"
,
"librosa"
:
"librosa"
,
"modelcards"
:
"modelcards>=0.1.4"
,
"numpy"
:
"numpy"
,
...
...
src/diffusers/pipelines/stable_diffusion/__init__.py
View file @
7e29b747
...
...
@@ -11,6 +11,7 @@ from ...utils import (
OptionalDependencyNotAvailable
,
is_flax_available
,
is_k_diffusion_available
,
is_k_diffusion_version
,
is_onnx_available
,
is_torch_available
,
is_transformers_available
,
...
...
@@ -64,7 +65,7 @@ else:
try
:
if
not
(
is_torch_available
()
and
is_transformers_available
()
and
is_k_diffusion_
available
(
)):
if
not
(
is_torch_available
()
and
is_transformers_available
()
and
is_k_diffusion_
version
(
">="
,
"0.0.12"
)):
raise
OptionalDependencyNotAvailable
()
except
OptionalDependencyNotAvailable
:
from
...utils.dummy_torch_and_transformers_and_k_diffusion_objects
import
*
# noqa F403
...
...
src/diffusers/utils/__init__.py
View file @
7e29b747
...
...
@@ -47,6 +47,7 @@ from .import_utils import (
is_flax_available
,
is_inflect_available
,
is_k_diffusion_available
,
is_k_diffusion_version
,
is_librosa_available
,
is_modelcards_available
,
is_onnx_available
,
...
...
src/diffusers/utils/import_utils.py
View file @
7e29b747
...
...
@@ -427,12 +427,26 @@ def is_transformers_version(operation: str, version: str):
operation (`str`):
A string representation of an operator, such as `">"` or `"<="`
version (`str`):
A
string
version
of PyTorch
A version
string
"""
if
not
_transformers_available
:
return
False
return
compare_versions
(
parse
(
_transformers_version
),
operation
,
version
)
def
is_k_diffusion_version
(
operation
:
str
,
version
:
str
):
"""
Args:
Compares the current k-diffusion version to a given reference with an operation.
operation (`str`):
A string representation of an operator, such as `">"` or `"<="`
version (`str`):
A version string
"""
if
not
_k_diffusion_available
:
return
False
return
compare_versions
(
parse
(
_k_diffusion_version
),
operation
,
version
)
class
OptionalDependencyNotAvailable
(
BaseException
):
"""An error indicating that an optional dependency of Diffusers was not found in the environment."""
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