From 2feb6c5c62d2b7b529314bdd3dffa33ca2714aa8 Mon Sep 17 00:00:00 2001 From: hlky Date: Fri, 27 Dec 2024 23:09:25 +0000 Subject: [PATCH 1/2] Optional components in AutoPipeline --- src/diffusers/pipelines/auto_pipeline.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/diffusers/pipelines/auto_pipeline.py b/src/diffusers/pipelines/auto_pipeline.py index f3a05c2c661f..38e3e04d1086 100644 --- a/src/diffusers/pipelines/auto_pipeline.py +++ b/src/diffusers/pipelines/auto_pipeline.py @@ -528,7 +528,12 @@ 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 = ( + set(expected_modules) + - set(pipeline._optional_components) + - set(text_2_image_cls._optional_components) + - set(text_2_image_kwargs.keys()) + ) if len(missing_modules) > 0: raise ValueError( @@ -838,7 +843,12 @@ 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(pipeline._optional_components) + - set(image_2_image_cls._optional_components) + - set(image_2_image_kwargs.keys()) + ) if len(missing_modules) > 0: raise ValueError( @@ -1141,7 +1151,12 @@ 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(pipeline._optional_components) + - set(inpainting_cls._optional_components) + - set(inpainting_kwargs.keys()) + ) if len(missing_modules) > 0: raise ValueError( From d1153bf6e20cd7fb3b0155d4c568a046df396494 Mon Sep 17 00:00:00 2001 From: hlky Date: Thu, 2 Jan 2025 18:32:57 +0000 Subject: [PATCH 2/2] missing_modules --- src/diffusers/pipelines/auto_pipeline.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/diffusers/pipelines/auto_pipeline.py b/src/diffusers/pipelines/auto_pipeline.py index 38e3e04d1086..a3e2fc6de78f 100644 --- a/src/diffusers/pipelines/auto_pipeline.py +++ b/src/diffusers/pipelines/auto_pipeline.py @@ -529,10 +529,7 @@ def from_pipe(cls, pipeline, **kwargs): } missing_modules = ( - set(expected_modules) - - set(pipeline._optional_components) - - set(text_2_image_cls._optional_components) - - set(text_2_image_kwargs.keys()) + set(expected_modules) - set(text_2_image_cls._optional_components) - set(text_2_image_kwargs.keys()) ) if len(missing_modules) > 0: @@ -844,10 +841,7 @@ def from_pipe(cls, pipeline, **kwargs): } missing_modules = ( - set(expected_modules) - - set(pipeline._optional_components) - - set(image_2_image_cls._optional_components) - - set(image_2_image_kwargs.keys()) + set(expected_modules) - set(image_2_image_cls._optional_components) - set(image_2_image_kwargs.keys()) ) if len(missing_modules) > 0: @@ -1152,10 +1146,7 @@ def from_pipe(cls, pipeline, **kwargs): } missing_modules = ( - set(expected_modules) - - set(pipeline._optional_components) - - set(inpainting_cls._optional_components) - - set(inpainting_kwargs.keys()) + set(expected_modules) - set(inpainting_cls._optional_components) - set(inpainting_kwargs.keys()) ) if len(missing_modules) > 0: