Skip to content

Add PAG Support for Stable Diffusion Inpaint Pipeline #9386

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 28 commits into from
Dec 10, 2024
Merged

Add PAG Support for Stable Diffusion Inpaint Pipeline #9386

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f367d36
using sd inpaint pipeline and sdxl pag inpaint pipeline to add changes
Aug 28, 2024
b16afb0
using sd inpaint pipeline and sdxl pag inpaint pipeline to add changes
Sep 1, 2024
7c939f7
finished the call function
Sep 1, 2024
fdf2a59
added auto pipeline
Sep 2, 2024
4250a54
merging diffusers
Sep 2, 2024
102baf7
Merge remote-tracking branch 'upstream/main'
Sep 2, 2024
ac471dc
ready to test
Sep 7, 2024
7fc3daa
ready to test
Sep 7, 2024
98ec6d8
merging diffusers
Sep 7, 2024
41f9612
added copied from and removed unnecessary tests
Oct 3, 2024
cd644f2
Merge remote-tracking branch 'upstream/main' into pag_sd_inpaint
Oct 4, 2024
0989a8c
make style changes
Oct 4, 2024
b933ea3
doc changes
Oct 4, 2024
784df80
updating example doc string
Oct 4, 2024
5bce578
style fix
Oct 10, 2024
22cabea
Merge remote-tracking branch 'upstream/main' into pag_sd_inpaint
Oct 10, 2024
f9d3d1b
init
Oct 10, 2024
2019d56
adding imports
Oct 10, 2024
769d650
quality
Oct 10, 2024
68b7365
Merge branch 'main' into pag_sd_inpaint
yiyixuxu Oct 10, 2024
ef4c4cd
Merge branch 'main' into pag_sd_inpaint
yiyixuxu Dec 3, 2024
921a8fc
Update src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py
hlky Dec 9, 2024
22f5460
Merge branch 'main' into pag_sd_inpaint
hlky Dec 9, 2024
7aa3914
make
hlky Dec 9, 2024
7821157
Update tests/pipelines/pag/test_pag_sd_inpaint.py
hlky Dec 9, 2024
814b4f0
slice and size
hlky Dec 10, 2024
e8cd4de
slice
hlky Dec 10, 2024
de5ef07
Merge branch 'main' into pag_sd_inpaint
hlky Dec 10, 2024
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
5 changes: 5 additions & 0 deletions docs/source/en/api/pipelines/pag.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ Since RegEx is supported as a way for matching layer identifiers, it is crucial
- all
- __call__

## StableDiffusionPAGInpaintPipeline
[[autodoc]] StableDiffusionPAGInpaintPipeline
- all
- __call__

## StableDiffusionPAGPipeline
[[autodoc]] StableDiffusionPAGPipeline
- all
Expand Down
2 changes: 2 additions & 0 deletions src/diffusers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@
"StableDiffusionLDM3DPipeline",
"StableDiffusionModelEditingPipeline",
"StableDiffusionPAGImg2ImgPipeline",
"StableDiffusionPAGInpaintPipeline",
"StableDiffusionPAGPipeline",
"StableDiffusionPanoramaPipeline",
"StableDiffusionParadigmsPipeline",
Expand Down Expand Up @@ -830,6 +831,7 @@
StableDiffusionLDM3DPipeline,
StableDiffusionModelEditingPipeline,
StableDiffusionPAGImg2ImgPipeline,
StableDiffusionPAGInpaintPipeline,
StableDiffusionPAGPipeline,
StableDiffusionPanoramaPipeline,
StableDiffusionParadigmsPipeline,
Expand Down
2 changes: 2 additions & 0 deletions src/diffusers/pipelines/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
"StableDiffusion3PAGPipeline",
"StableDiffusionPAGPipeline",
"StableDiffusionPAGImg2ImgPipeline",
"StableDiffusionPAGInpaintPipeline",
"StableDiffusionControlNetPAGPipeline",
"StableDiffusionXLPAGPipeline",
"StableDiffusionXLPAGInpaintPipeline",
Expand Down Expand Up @@ -593,6 +594,7 @@
StableDiffusionControlNetPAGInpaintPipeline,
StableDiffusionControlNetPAGPipeline,
StableDiffusionPAGImg2ImgPipeline,
StableDiffusionPAGInpaintPipeline,
StableDiffusionPAGPipeline,
StableDiffusionXLControlNetPAGImg2ImgPipeline,
StableDiffusionXLControlNetPAGPipeline,
Expand Down
2 changes: 2 additions & 0 deletions src/diffusers/pipelines/auto_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
StableDiffusionControlNetPAGInpaintPipeline,
StableDiffusionControlNetPAGPipeline,
StableDiffusionPAGImg2ImgPipeline,
StableDiffusionPAGInpaintPipeline,
StableDiffusionPAGPipeline,
StableDiffusionXLControlNetPAGImg2ImgPipeline,
StableDiffusionXLControlNetPAGPipeline,
Expand Down Expand Up @@ -158,6 +159,7 @@
("stable-diffusion-xl-pag", StableDiffusionXLPAGInpaintPipeline),
("flux", FluxInpaintPipeline),
("flux-controlnet", FluxControlNetInpaintPipeline),
("stable-diffusion-pag", StableDiffusionPAGInpaintPipeline),
]
)

Expand Down
3 changes: 3 additions & 0 deletions src/diffusers/pipelines/pag/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
_import_structure["pipeline_pag_sd_3"] = ["StableDiffusion3PAGPipeline"]
_import_structure["pipeline_pag_sd_animatediff"] = ["AnimateDiffPAGPipeline"]
_import_structure["pipeline_pag_sd_img2img"] = ["StableDiffusionPAGImg2ImgPipeline"]
_import_structure["pipeline_pag_sd_inpaint"] = ["StableDiffusionPAGInpaintPipeline"]

_import_structure["pipeline_pag_sd_xl"] = ["StableDiffusionXLPAGPipeline"]
_import_structure["pipeline_pag_sd_xl_img2img"] = ["StableDiffusionXLPAGImg2ImgPipeline"]
_import_structure["pipeline_pag_sd_xl_inpaint"] = ["StableDiffusionXLPAGInpaintPipeline"]
Expand All @@ -56,6 +58,7 @@
from .pipeline_pag_sd_3 import StableDiffusion3PAGPipeline
from .pipeline_pag_sd_animatediff import AnimateDiffPAGPipeline
from .pipeline_pag_sd_img2img import StableDiffusionPAGImg2ImgPipeline
Copy link
Collaborator

Choose a reason for hiding this comment

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

is this a merge conflict? can yo uadd this line back?

Copy link
Collaborator

Choose a reason for hiding this comment

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

also need to add pag sd inpaint here too -currently CI fail for some import error

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

from .pipeline_pag_sd_inpaint import StableDiffusionPAGInpaintPipeline
from .pipeline_pag_sd_xl import StableDiffusionXLPAGPipeline
from .pipeline_pag_sd_xl_img2img import StableDiffusionXLPAGImg2ImgPipeline
from .pipeline_pag_sd_xl_inpaint import StableDiffusionXLPAGInpaintPipeline
Expand Down
Loading
Loading