Skip to content

Commit 7c79e70

Browse files
authored
[core] deprecate onnx (huggingface#14658)
* deprecate onnx * up
1 parent 77c13f8 commit 7c79e70

16 files changed

Lines changed: 35 additions & 1074 deletions

‎.github/workflows/nightly_tests.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@ jobs:
461461
run_big_gpu_torch_tests,
462462
run_nightly_quantization_tests,
463463
run_nightly_pipeline_level_quantization_tests,
464-
# run_nightly_onnx_tests,
465464
torch_minimum_version_cuda_tests,
466465
]
467466
if: always()

‎src/diffusers/pipelines/deprecated/stable_diffusion_variants/pipeline_onnx_stable_diffusion_inpaint_legacy.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from ....schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler
1111
from ....utils import deprecate, logging
1212
from ...onnx_utils import ORT_TO_NP_TYPE, OnnxRuntimeModel
13-
from ...pipeline_utils import DiffusionPipeline
13+
from ...pipeline_utils import DeprecatedPipelineMixin, DiffusionPipeline
1414
from ...stable_diffusion.pipeline_output import StableDiffusionPipelineOutput
1515

1616

@@ -38,7 +38,9 @@ def preprocess_mask(mask, scale_factor=8):
3838
return mask
3939

4040

41-
class OnnxStableDiffusionInpaintPipelineLegacy(DiffusionPipeline):
41+
class OnnxStableDiffusionInpaintPipelineLegacy(DeprecatedPipelineMixin, DiffusionPipeline):
42+
_last_supported_version = "0.43.0"
43+
4244
r"""
4345
Pipeline for text-guided image inpainting using Stable Diffusion. This is a *legacy feature* for Onnx pipelines to
4446
provide compatibility with StableDiffusionInpaintPipelineLegacy and may be removed in the future.

‎src/diffusers/pipelines/onnx_utils.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from huggingface_hub import hf_hub_download
2525
from huggingface_hub.utils import validate_hf_hub_args
2626

27-
from ..utils import ONNX_EXTERNAL_WEIGHTS_NAME, ONNX_WEIGHTS_NAME, is_onnx_available, logging
27+
from ..utils import ONNX_EXTERNAL_WEIGHTS_NAME, ONNX_WEIGHTS_NAME, deprecate, is_onnx_available, logging
2828

2929

3030
if is_onnx_available():
@@ -50,8 +50,14 @@
5050

5151

5252
class OnnxRuntimeModel:
53+
_last_supported_version = "0.43.0"
54+
5355
def __init__(self, model=None, **kwargs):
54-
logger.info("`diffusers.OnnxRuntimeModel` is experimental and might change in the future.")
56+
deprecate(
57+
"OnnxRuntimeModel",
58+
"0.43.0",
59+
"Please use Optimum for ONNX Runtime support.",
60+
)
5561
self.model = model
5662
self.model_save_dir = kwargs.get("model_save_dir", None)
5763
self.latest_model_name = kwargs.get("latest_model_name", ONNX_WEIGHTS_NAME)

‎src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@
2323
from ...schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler
2424
from ...utils import deprecate, logging
2525
from ..onnx_utils import ORT_TO_NP_TYPE, OnnxRuntimeModel
26-
from ..pipeline_utils import DiffusionPipeline
26+
from ..pipeline_utils import DeprecatedPipelineMixin, DiffusionPipeline
2727
from . import StableDiffusionPipelineOutput
2828

2929

3030
logger = logging.get_logger(__name__)
3131

3232

33-
class OnnxStableDiffusionPipeline(DiffusionPipeline):
33+
class OnnxStableDiffusionPipeline(DeprecatedPipelineMixin, DiffusionPipeline):
34+
_last_supported_version = "0.43.0"
35+
3436
vae_encoder: OnnxRuntimeModel
3537
vae_decoder: OnnxRuntimeModel
3638
text_encoder: OnnxRuntimeModel

‎src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_img2img.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from ...schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler
2525
from ...utils import PIL_INTERPOLATION, deprecate, logging
2626
from ..onnx_utils import ORT_TO_NP_TYPE, OnnxRuntimeModel
27-
from ..pipeline_utils import DiffusionPipeline
27+
from ..pipeline_utils import DeprecatedPipelineMixin, DiffusionPipeline
2828
from . import StableDiffusionPipelineOutput
2929

3030

@@ -55,7 +55,9 @@ def preprocess(image):
5555
return image
5656

5757

58-
class OnnxStableDiffusionImg2ImgPipeline(DiffusionPipeline):
58+
class OnnxStableDiffusionImg2ImgPipeline(DeprecatedPipelineMixin, DiffusionPipeline):
59+
_last_supported_version = "0.43.0"
60+
5961
r"""
6062
Pipeline for text-guided image to image generation using Stable Diffusion.
6163

‎src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_inpaint.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from ...schedulers import DDIMScheduler, LMSDiscreteScheduler, PNDMScheduler
2525
from ...utils import PIL_INTERPOLATION, deprecate, logging
2626
from ..onnx_utils import ORT_TO_NP_TYPE, OnnxRuntimeModel
27-
from ..pipeline_utils import DiffusionPipeline
27+
from ..pipeline_utils import DeprecatedPipelineMixin, DiffusionPipeline
2828
from . import StableDiffusionPipelineOutput
2929

3030

@@ -53,7 +53,9 @@ def prepare_mask_and_masked_image(image, mask, latents_shape):
5353
return mask, masked_image
5454

5555

56-
class OnnxStableDiffusionInpaintPipeline(DiffusionPipeline):
56+
class OnnxStableDiffusionInpaintPipeline(DeprecatedPipelineMixin, DiffusionPipeline):
57+
_last_supported_version = "0.43.0"
58+
5759
r"""
5860
Pipeline for text-guided image inpainting using Stable Diffusion. *This is an experimental feature*.
5961

‎src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion_upscale.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from ...schedulers import DDPMScheduler, KarrasDiffusionSchedulers
2525
from ...utils import deprecate, logging
2626
from ..onnx_utils import ORT_TO_NP_TYPE, OnnxRuntimeModel
27-
from ..pipeline_utils import DiffusionPipeline
27+
from ..pipeline_utils import DeprecatedPipelineMixin, DiffusionPipeline
2828
from . import StableDiffusionPipelineOutput
2929

3030

@@ -53,7 +53,9 @@ def preprocess(image):
5353
return image
5454

5555

56-
class OnnxStableDiffusionUpscalePipeline(DiffusionPipeline):
56+
class OnnxStableDiffusionUpscalePipeline(DeprecatedPipelineMixin, DiffusionPipeline):
57+
_last_supported_version = "0.43.0"
58+
5759
vae: OnnxRuntimeModel
5860
text_encoder: OnnxRuntimeModel
5961
tokenizer: CLIPTokenizer

‎tests/others/test_check_dummies.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,16 @@ def test_find_backend(self):
4343
# )
4444
# assert double_backend_with_underscore == "sentencepiece_and_tensorflow_text"
4545

46-
triple_backend = find_backend(
47-
" if not (is_torch_available() and is_transformers_available() and is_onnx_available()):"
48-
)
49-
assert triple_backend == "torch_and_transformers_and_onnx"
50-
5146
def test_read_init(self):
5247
objects = read_init()
5348
# We don't assert on the exact list of keys to allow for smooth grow of backend-specific objects
5449
assert "torch" in objects
5550
assert "torch_and_transformers" in objects
56-
assert "torch_and_transformers_and_onnx" in objects
5751

5852
# Likewise, we can't assert on the exact content of a key
5953
assert "UNet2DModel" in objects["torch"]
6054
assert "StableDiffusionPipeline" in objects["torch_and_transformers"]
6155
assert "LMSDiscreteScheduler" in objects["torch_and_scipy"]
62-
assert "OnnxStableDiffusionPipeline" in objects["torch_and_transformers_and_onnx"]
6356

6457
def test_create_dummy_object(self):
6558
dummy_constant = create_dummy_object("CONSTANT", "'torch'")

0 commit comments

Comments
 (0)