Unverified Commit 144c3a8b authored by Patrick von Platen's avatar Patrick von Platen Committed by GitHub
Browse files

[Imports] Fix many import bugs and make sure that doc builder CI test works correctly (#5176)

* [Doc builder] Ensure slow import for doc builder

* Apply suggestions from code review

* env for doc builder

* fix more

* [Diffusers] Set import to slow as env variable

* fix docs

* fix docs

* Apply suggestions from code review

* Apply suggestions from code review

* fix docs

* fix docs
parent 30a512ea
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import ( from ...utils import (
DIFFUSERS_SLOW_IMPORT,
_LazyModule, _LazyModule,
) )
_import_structure = {"pipeline_ddpm": ["DDPMPipeline"]} _import_structure = {"pipeline_ddpm": ["DDPMPipeline"]}
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
from .pipeline_ddpm import DDPMPipeline from .pipeline_ddpm import DDPMPipeline
else: else:
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import ( from ...utils import (
DIFFUSERS_SLOW_IMPORT,
OptionalDependencyNotAvailable, OptionalDependencyNotAvailable,
_LazyModule, _LazyModule,
get_objects_from_module, get_objects_from_module,
...@@ -42,7 +43,7 @@ else: ...@@ -42,7 +43,7 @@ else:
_import_structure["watermark"] = ["IFWatermarker"] _import_structure["watermark"] = ["IFWatermarker"]
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
try: try:
if not (is_transformers_available() and is_torch_available()): if not (is_transformers_available() and is_torch_available()):
raise OptionalDependencyNotAvailable() raise OptionalDependencyNotAvailable()
......
...@@ -20,7 +20,7 @@ from ...utils import ( ...@@ -20,7 +20,7 @@ from ...utils import (
) )
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 IFPipelineOutput from .pipeline_output import IFPipelineOutput
from .safety_checker import IFSafetyChecker from .safety_checker import IFSafetyChecker
from .watermark import IFWatermarker from .watermark import IFWatermarker
......
...@@ -23,7 +23,7 @@ from ...utils import ( ...@@ -23,7 +23,7 @@ from ...utils import (
) )
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 IFPipelineOutput from .pipeline_output import IFPipelineOutput
from .safety_checker import IFSafetyChecker from .safety_checker import IFSafetyChecker
from .watermark import IFWatermarker from .watermark import IFWatermarker
......
...@@ -24,7 +24,7 @@ from ...utils import ( ...@@ -24,7 +24,7 @@ from ...utils import (
) )
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 IFPipelineOutput from .pipeline_output import IFPipelineOutput
from .safety_checker import IFSafetyChecker from .safety_checker import IFSafetyChecker
from .watermark import IFWatermarker from .watermark import IFWatermarker
......
...@@ -23,7 +23,7 @@ from ...utils import ( ...@@ -23,7 +23,7 @@ from ...utils import (
) )
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 IFPipelineOutput from .pipeline_output import IFPipelineOutput
from .safety_checker import IFSafetyChecker from .safety_checker import IFSafetyChecker
from .watermark import IFWatermarker from .watermark import IFWatermarker
......
...@@ -24,7 +24,7 @@ from ...utils import ( ...@@ -24,7 +24,7 @@ from ...utils import (
) )
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 IFPipelineOutput from .pipeline_output import IFPipelineOutput
from .safety_checker import IFSafetyChecker from .safety_checker import IFSafetyChecker
from .watermark import IFWatermarker from .watermark import IFWatermarker
......
...@@ -23,7 +23,7 @@ from ...utils import ( ...@@ -23,7 +23,7 @@ from ...utils import (
) )
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 IFPipelineOutput from .pipeline_output import IFPipelineOutput
from .safety_checker import IFSafetyChecker from .safety_checker import IFSafetyChecker
from .watermark import IFWatermarker from .watermark import IFWatermarker
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import _LazyModule from ...utils import DIFFUSERS_SLOW_IMPORT, _LazyModule
_import_structure = {"pipeline_dit": ["DiTPipeline"]} _import_structure = {"pipeline_dit": ["DiTPipeline"]}
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
from .pipeline_dit import DiTPipeline from .pipeline_dit import DiTPipeline
else: else:
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import ( from ...utils import (
DIFFUSERS_SLOW_IMPORT,
OptionalDependencyNotAvailable, OptionalDependencyNotAvailable,
_LazyModule, _LazyModule,
get_objects_from_module, get_objects_from_module,
...@@ -32,7 +33,7 @@ else: ...@@ -32,7 +33,7 @@ else:
_import_structure["text_encoder"] = ["MultilingualCLIP"] _import_structure["text_encoder"] = ["MultilingualCLIP"]
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
try: try:
if not (is_transformers_available() and is_torch_available()): if not (is_transformers_available() and is_torch_available()):
raise OptionalDependencyNotAvailable() raise OptionalDependencyNotAvailable()
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import ( from ...utils import (
DIFFUSERS_SLOW_IMPORT,
OptionalDependencyNotAvailable, OptionalDependencyNotAvailable,
_LazyModule, _LazyModule,
get_objects_from_module, get_objects_from_module,
...@@ -34,7 +35,7 @@ else: ...@@ -34,7 +35,7 @@ else:
_import_structure["pipeline_kandinsky2_2_prior_emb2emb"] = ["KandinskyV22PriorEmb2EmbPipeline"] _import_structure["pipeline_kandinsky2_2_prior_emb2emb"] = ["KandinskyV22PriorEmb2EmbPipeline"]
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
try: try:
if not (is_transformers_available() and is_torch_available()): if not (is_transformers_available() and is_torch_available()):
raise OptionalDependencyNotAvailable() raise OptionalDependencyNotAvailable()
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import ( from ...utils import (
DIFFUSERS_SLOW_IMPORT,
OptionalDependencyNotAvailable, OptionalDependencyNotAvailable,
_LazyModule, _LazyModule,
get_objects_from_module, get_objects_from_module,
...@@ -24,7 +25,7 @@ else: ...@@ -24,7 +25,7 @@ else:
_import_structure["pipeline_latent_diffusion_superresolution"] = ["LDMSuperResolutionPipeline"] _import_structure["pipeline_latent_diffusion_superresolution"] = ["LDMSuperResolutionPipeline"]
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
try: try:
if not (is_transformers_available() and is_torch_available()): if not (is_transformers_available() and is_torch_available()):
raise OptionalDependencyNotAvailable() raise OptionalDependencyNotAvailable()
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import _LazyModule from ...utils import DIFFUSERS_SLOW_IMPORT, _LazyModule
_import_structure = {"pipeline_latent_diffusion_uncond": ["LDMPipeline"]} _import_structure = {"pipeline_latent_diffusion_uncond": ["LDMPipeline"]}
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
from .pipeline_latent_diffusion_uncond import LDMPipeline from .pipeline_latent_diffusion_uncond import LDMPipeline
else: else:
import sys import sys
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import ( from ...utils import (
DIFFUSERS_SLOW_IMPORT,
OptionalDependencyNotAvailable, OptionalDependencyNotAvailable,
_LazyModule, _LazyModule,
get_objects_from_module, get_objects_from_module,
...@@ -24,7 +25,7 @@ else: ...@@ -24,7 +25,7 @@ else:
_import_structure["pipeline_musicldm"] = ["MusicLDMPipeline"] _import_structure["pipeline_musicldm"] = ["MusicLDMPipeline"]
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
try: try:
if not (is_transformers_available() and is_torch_available() and is_transformers_version(">=", "4.27.0")): if not (is_transformers_available() and is_torch_available() and is_transformers_version(">=", "4.27.0")):
raise OptionalDependencyNotAvailable() raise OptionalDependencyNotAvailable()
......
...@@ -6,6 +6,7 @@ import PIL ...@@ -6,6 +6,7 @@ import PIL
from PIL import Image from PIL import Image
from ...utils import ( from ...utils import (
DIFFUSERS_SLOW_IMPORT,
OptionalDependencyNotAvailable, OptionalDependencyNotAvailable,
_LazyModule, _LazyModule,
get_objects_from_module, get_objects_from_module,
...@@ -29,7 +30,7 @@ else: ...@@ -29,7 +30,7 @@ else:
_import_structure["pipeline_paint_by_example"] = ["PaintByExamplePipeline"] _import_structure["pipeline_paint_by_example"] = ["PaintByExamplePipeline"]
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
try: try:
if not (is_transformers_available() and is_torch_available()): if not (is_transformers_available() and is_torch_available()):
raise OptionalDependencyNotAvailable() raise OptionalDependencyNotAvailable()
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import _LazyModule from ...utils import DIFFUSERS_SLOW_IMPORT, _LazyModule
_import_structure = {"pipeline_pndm": ["PNDMPipeline"]} _import_structure = {"pipeline_pndm": ["PNDMPipeline"]}
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
from .pipeline_pndm import PNDMPipeline from .pipeline_pndm import PNDMPipeline
else: else:
import sys import sys
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import _LazyModule from ...utils import DIFFUSERS_SLOW_IMPORT, _LazyModule
_import_structure = {"pipeline_repaint": ["RePaintPipeline"]} _import_structure = {"pipeline_repaint": ["RePaintPipeline"]}
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
from .pipeline_repaint import RePaintPipeline from .pipeline_repaint import RePaintPipeline
else: else:
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import _LazyModule from ...utils import DIFFUSERS_SLOW_IMPORT, _LazyModule
_import_structure = {"pipeline_score_sde_ve": ["ScoreSdeVePipeline"]} _import_structure = {"pipeline_score_sde_ve": ["ScoreSdeVePipeline"]}
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
from .pipeline_score_sde_ve import ScoreSdeVePipeline from .pipeline_score_sde_ve import ScoreSdeVePipeline
else: else:
......
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from ...utils import ( from ...utils import (
DIFFUSERS_SLOW_IMPORT,
OptionalDependencyNotAvailable, OptionalDependencyNotAvailable,
_LazyModule, _LazyModule,
get_objects_from_module, get_objects_from_module,
...@@ -24,7 +25,7 @@ else: ...@@ -24,7 +25,7 @@ else:
_import_structure["pipeline_semantic_stable_diffusion"] = ["SemanticStableDiffusionPipeline"] _import_structure["pipeline_semantic_stable_diffusion"] = ["SemanticStableDiffusionPipeline"]
if TYPE_CHECKING: if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
try: try:
if not (is_transformers_available() and is_torch_available()): if not (is_transformers_available() and is_torch_available()):
raise OptionalDependencyNotAvailable() raise OptionalDependencyNotAvailable()
......
...@@ -12,7 +12,7 @@ from ...schedulers import KarrasDiffusionSchedulers ...@@ -12,7 +12,7 @@ from ...schedulers import KarrasDiffusionSchedulers
from ...utils import deprecate, logging from ...utils import deprecate, logging
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 SemanticStableDiffusionPipelineOutput from .pipeline_output import SemanticStableDiffusionPipelineOutput
logger = logging.get_logger(__name__) # pylint: disable=invalid-name logger = logging.get_logger(__name__) # pylint: disable=invalid-name
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment