Skip to content

Fix AutoPipeline from_pipe where source pipeline is missing target pipeline's optional components #10400

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
merged 4 commits into from
Jan 2, 2025
Merged

Fix AutoPipeline from_pipe where source pipeline is missing target pipeline's optional components #10400

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2feb6c5
Optional components in AutoPipeline
hlky Dec 27, 2024
0be3716
Merge branch 'main' into auto-pipeline-optional-components
yiyixuxu Jan 2, 2025
d1153bf
missing_modules
hlky Jan 2, 2025
cc30c32
Merge branch 'main' into auto-pipeline-optional-components
yiyixuxu Jan 2, 2025
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
12 changes: 9 additions & 3 deletions src/diffusers/pipelines/auto_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,9 @@ def from_pipe(cls, pipeline, **kwargs):
if k not in text_2_image_kwargs
}

missing_modules = set(expected_modules) - set(pipeline._optional_components) - set(text_2_image_kwargs.keys())
missing_modules = (
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think maybe

missing_modules = set(expected_modules) - set(text_2_image_cls._optional_components) - set(text_2_image_kwargs.keys())

Because if one component is optional for the other pipe (the pipe as in .from_pipe(pipe)) but it's not optional for the target pipe (text_2_image here) - it is still missing, no?

Just a thought: I didn't run any tests, I think it might a bug we had and was able to get away with this because the _optional_componentes is usually the same among different tasks for the same model group

so please let me know if it is the case:)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense, thanks

set(expected_modules) - set(text_2_image_cls._optional_components) - set(text_2_image_kwargs.keys())
)

if len(missing_modules) > 0:
raise ValueError(
Expand Down Expand Up @@ -838,7 +840,9 @@ def from_pipe(cls, pipeline, **kwargs):
if k not in image_2_image_kwargs
}

missing_modules = set(expected_modules) - set(pipeline._optional_components) - set(image_2_image_kwargs.keys())
missing_modules = (
set(expected_modules) - set(image_2_image_cls._optional_components) - set(image_2_image_kwargs.keys())
)

if len(missing_modules) > 0:
raise ValueError(
Expand Down Expand Up @@ -1141,7 +1145,9 @@ def from_pipe(cls, pipeline, **kwargs):
if k not in inpainting_kwargs
}

missing_modules = set(expected_modules) - set(pipeline._optional_components) - set(inpainting_kwargs.keys())
missing_modules = (
set(expected_modules) - set(inpainting_cls._optional_components) - set(inpainting_kwargs.keys())
)

if len(missing_modules) > 0:
raise ValueError(
Expand Down
Loading