Skip to content

Commit e43c6f9

Browse files
committed
OpenCV dummy objects
1 parent d1387ec commit e43c6f9

File tree

4 files changed

+36
-21
lines changed

4 files changed

+36
-21
lines changed

src/diffusers/__init__.py

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
is_torchsde_available,
2323
is_transformers_available,
2424
)
25+
from .utils.import_utils import is_opencv_available
2526

2627

2728
# Lazy Import based on
@@ -352,7 +353,6 @@
352353
"CogView3PlusPipeline",
353354
"CogView4ControlPipeline",
354355
"CogView4Pipeline",
355-
"ConsisIDPipeline",
356356
"CycleDiffusionPipeline",
357357
"EasyAnimateControlPipeline",
358358
"EasyAnimateInpaintPipeline",
@@ -518,6 +518,25 @@
518518
]
519519
)
520520

521+
522+
try:
523+
if not (is_torch_available() and is_transformers_available() and is_opencv_available()):
524+
raise OptionalDependencyNotAvailable()
525+
except OptionalDependencyNotAvailable:
526+
from .utils import dummy_torch_and_transformers_and_opencv_objects # noqa F403
527+
528+
_import_structure["utils.dummy_torch_and_transformers_and_opencv_objects"] = [
529+
name for name in dir(dummy_torch_and_transformers_and_opencv_objects) if not name.startswith("_")
530+
]
531+
532+
else:
533+
_import_structure["pipelines"].extend(
534+
[
535+
"ConsisIDPipeline",
536+
]
537+
)
538+
539+
521540
try:
522541
if not (is_torch_available() and is_transformers_available() and is_k_diffusion_available()):
523542
raise OptionalDependencyNotAvailable()
@@ -1073,6 +1092,16 @@
10731092
WuerstchenPriorPipeline,
10741093
)
10751094

1095+
try:
1096+
if not (is_torch_available() and is_transformers_available() and is_opencv_available()):
1097+
raise OptionalDependencyNotAvailable()
1098+
except OptionalDependencyNotAvailable:
1099+
from .utils.dummy_torch_and_transformers_and_opencv_objects import * # noqa F403
1100+
else:
1101+
from .pipelines import (
1102+
ConsisIDPipeline,
1103+
)
1104+
10761105
try:
10771106
if not (is_torch_available() and is_transformers_available() and is_k_diffusion_available()):
10781107
raise OptionalDependencyNotAvailable()

src/diffusers/pipelines/consisid/__init__.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,30 @@
88
is_torch_available,
99
is_transformers_available,
1010
)
11+
from ...utils.import_utils import is_opencv_available
1112

1213

1314
_dummy_objects = {}
1415
_import_structure = {}
1516

1617

1718
try:
18-
if not (is_transformers_available() and is_torch_available()):
19+
if not (is_transformers_available() and is_torch_available() and is_opencv_available()):
1920
raise OptionalDependencyNotAvailable()
2021
except OptionalDependencyNotAvailable:
21-
from ...utils import dummy_torch_and_transformers_objects # noqa F403
22+
from ...utils import dummy_torch_and_transformers_and_opencv_objects # noqa F403
2223

23-
_dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_objects))
24+
_dummy_objects.update(get_objects_from_module(dummy_torch_and_transformers_and_opencv_objects))
2425
else:
2526
_import_structure["pipeline_consisid"] = ["ConsisIDPipeline"]
2627

2728
if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
2829
try:
29-
if not (is_transformers_available() and is_torch_available()):
30+
if not (is_transformers_available() and is_torch_available() and is_opencv_available()):
3031
raise OptionalDependencyNotAvailable()
3132

3233
except OptionalDependencyNotAvailable:
33-
from ...utils.dummy_torch_and_transformers_objects import *
34+
from ...utils.dummy_torch_and_transformers_and_opencv_objects import *
3435
else:
3536
from .pipeline_consisid import ConsisIDPipeline
3637

src/diffusers/utils/dummy_torch_and_transformers_and_opencv_objects.py

Whitespace-only changes.

src/diffusers/utils/dummy_torch_and_transformers_objects.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -392,21 +392,6 @@ def from_pretrained(cls, *args, **kwargs):
392392
requires_backends(cls, ["torch", "transformers"])
393393

394394

395-
class ConsisIDPipeline(metaclass=DummyObject):
396-
_backends = ["torch", "transformers"]
397-
398-
def __init__(self, *args, **kwargs):
399-
requires_backends(self, ["torch", "transformers"])
400-
401-
@classmethod
402-
def from_config(cls, *args, **kwargs):
403-
requires_backends(cls, ["torch", "transformers"])
404-
405-
@classmethod
406-
def from_pretrained(cls, *args, **kwargs):
407-
requires_backends(cls, ["torch", "transformers"])
408-
409-
410395
class CycleDiffusionPipeline(metaclass=DummyObject):
411396
_backends = ["torch", "transformers"]
412397

0 commit comments

Comments
 (0)