Skip to content

Restore compatibility with deprecated StableDiffusionOnnxPipeline #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anton-l merged 3 commits into from
Nov 8, 2022
Merged

Restore compatibility with deprecated StableDiffusionOnnxPipeline #1191

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e27fc7
Restore compatibility with old ONNX pipeline.
pcuenca Nov 8, 2022
7ff7a43
Merge remote-tracking branch 'origin/main' into fix-old-onnx-pipeline
pcuenca Nov 8, 2022
47c87ad
Add missing attribute `vae_encoder`
pcuenca Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/diffusers/pipelines/stable_diffusion/pipeline_onnx_stable_diffusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@


class OnnxStableDiffusionPipeline(DiffusionPipeline):
vae_encoder: OnnxRuntimeModel
vae_decoder: OnnxRuntimeModel
text_encoder: OnnxRuntimeModel
tokenizer: CLIPTokenizer
Expand Down Expand Up @@ -268,6 +269,7 @@ def __call__(
class StableDiffusionOnnxPipeline(OnnxStableDiffusionPipeline):
def __init__(
self,
vae_encoder: OnnxRuntimeModel,
Copy link
Member Author

@pcuenca pcuenca Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alt 1/2: remove this line

Copy link
Member

@anton-l anton-l Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the old pipeline didn't have an encoder, so let's remove and substitute it with **kwargs

vae_decoder: OnnxRuntimeModel,
text_encoder: OnnxRuntimeModel,
tokenizer: CLIPTokenizer,
Expand All @@ -279,6 +281,7 @@ def __init__(
deprecation_message = "Please use `OnnxStableDiffusionPipeline` instead of `StableDiffusionOnnxPipeline`."
deprecate("StableDiffusionOnnxPipeline", "1.0.0", deprecation_message)
super().__init__(
vae_encoder=vae_encoder,
Copy link
Member Author

@pcuenca pcuenca Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alt 2/2: vae_encoder=None

Copy link
Member

@anton-l anton-l Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None would work with **kwargs as well 👍

Copy link
Member Author

@pcuenca pcuenca Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not able to make **kwargs work, it fails later in from_pretrained because it tries to match a module named "kwargs".

In addition, omitting vae_encoder in the __init__ causes an additional warning:

Keyword arguments {'vae_encoder': ['diffusers', 'OnnxRuntimeModel']} not recognized.

So I'd be inclined to leave it as it is here. You are welcome to take another look though :)

vae_decoder=vae_decoder,
text_encoder=text_encoder,
tokenizer=tokenizer,
Expand Down