Skip to content

Commit 7e29b74

Browse files
authored
Check k-diffusion version is at least 0.0.12 (#2022)
* Check k-diffusion version is at least 0.0.12 * make style
1 parent a43bdd0 commit 7e29b74

File tree

6 files changed

+22
-5
lines changed

6 files changed

+22
-5
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"isort>=5.5.4",
9292
"jax>=0.2.8,!=0.3.2",
9393
"jaxlib>=0.1.65",
94-
"k-diffusion",
94+
"k-diffusion>=0.0.12",
9595
"librosa",
9696
"modelcards>=0.1.4",
9797
"numpy",

src/diffusers/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
is_flax_available,
77
is_inflect_available,
88
is_k_diffusion_available,
9+
is_k_diffusion_version,
910
is_librosa_available,
1011
is_onnx_available,
1112
is_scipy_available,

src/diffusers/dependency_versions_table.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
deps = {
55
"Pillow": "Pillow",
66
"accelerate": "accelerate>=0.11.0",
7-
"black": "black==22.8",
7+
"black": "black==22.12",
88
"datasets": "datasets",
99
"filelock": "filelock",
1010
"flake8": "flake8>=3.8.3",
@@ -15,7 +15,7 @@
1515
"isort": "isort>=5.5.4",
1616
"jax": "jax>=0.2.8,!=0.3.2",
1717
"jaxlib": "jaxlib>=0.1.65",
18-
"k-diffusion": "k-diffusion",
18+
"k-diffusion": "k-diffusion>=0.0.12",
1919
"librosa": "librosa",
2020
"modelcards": "modelcards>=0.1.4",
2121
"numpy": "numpy",

src/diffusers/pipelines/stable_diffusion/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
OptionalDependencyNotAvailable,
1212
is_flax_available,
1313
is_k_diffusion_available,
14+
is_k_diffusion_version,
1415
is_onnx_available,
1516
is_torch_available,
1617
is_transformers_available,
@@ -64,7 +65,7 @@ class StableDiffusionPipelineOutput(BaseOutput):
6465

6566

6667
try:
67-
if not (is_torch_available() and is_transformers_available() and is_k_diffusion_available()):
68+
if not (is_torch_available() and is_transformers_available() and is_k_diffusion_version(">=", "0.0.12")):
6869
raise OptionalDependencyNotAvailable()
6970
except OptionalDependencyNotAvailable:
7071
from ...utils.dummy_torch_and_transformers_and_k_diffusion_objects import * # noqa F403

src/diffusers/utils/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
is_flax_available,
4848
is_inflect_available,
4949
is_k_diffusion_available,
50+
is_k_diffusion_version,
5051
is_librosa_available,
5152
is_modelcards_available,
5253
is_onnx_available,

src/diffusers/utils/import_utils.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,26 @@ def is_transformers_version(operation: str, version: str):
427427
operation (`str`):
428428
A string representation of an operator, such as `">"` or `"<="`
429429
version (`str`):
430-
A string version of PyTorch
430+
A version string
431431
"""
432432
if not _transformers_available:
433433
return False
434434
return compare_versions(parse(_transformers_version), operation, version)
435435

436436

437+
def is_k_diffusion_version(operation: str, version: str):
438+
"""
439+
Args:
440+
Compares the current k-diffusion version to a given reference with an operation.
441+
operation (`str`):
442+
A string representation of an operator, such as `">"` or `"<="`
443+
version (`str`):
444+
A version string
445+
"""
446+
if not _k_diffusion_available:
447+
return False
448+
return compare_versions(parse(_k_diffusion_version), operation, version)
449+
450+
437451
class OptionalDependencyNotAvailable(BaseException):
438452
"""An error indicating that an optional dependency of Diffusers was not found in the environment."""

0 commit comments

Comments
 (0)