Skip to content
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.

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

Broken in A1111 even with git apply --ignore whitespace (...) #13

Open
oliverban opened this issue May 2, 2023 · 8 comments
Open

Broken in A1111 even with git apply --ignore whitespace (...) #13

oliverban opened this issue May 2, 2023 · 8 comments

Comments

@oliverban
Copy link

When doing git apply --ignore-whitespace extensions/sd_webui_SAG/automatic1111-CFGDenoiser-and-script_callbacks-mod-for-SAG.patch

I get:
error: patch failed: modules/sd_samplers_kdiffusion.py:146
error: modules/sd_samplers_kdiffusion.py: patch does not apply

@ifffrt
Copy link

ifffrt commented May 3, 2023

At this point I think it would be better if the dev pushed this feature into the base Automatic1111 webui itself with a PR, since adding SAG requires changing way too many core lines of code. This way SAG would become a first class citizen and won't have to be afraid of things breaking after every commit anymore.

@Traslogan
Copy link

Same issue here, Auto1111 produces the same error trying to do the post-install setup

@papuSpartan
Copy link

If you don't mind trying out the dev branch of a1111, I made an update of the patch for it.

@xcanner
Copy link

xcanner commented May 4, 2023

If you don't mind trying out the dev branch of a1111, I made an update of the patch for it.

I tried your patch and it fixed for me, thank you

@wklchris
Copy link

wklchris commented May 7, 2023

For anyone using A1111 webui's recent release (v1.1 on master branch) and finding SAG not working, I made a patch for the latest webui commit (5ab7f213) and SAG commit (83d66a6). I tested it on my device with above webui & SAG versions and the patch works.

Please find the patch file in my gist:

Patch for A1111 webui and SAG (sd-webui-SAG-patch-5ab7f213-83d66a6c.patch)

I'd give full credit to papuSpartan for his answer for dev branch patch above. I just move his patched lines to master branch.

@alenknight
Copy link

is this patch still working with the latest version of A1111? that came out today? i'm getting an error saying error: corrupt patch at line 108 when i try to run it from root SD webui folder

@catboxanon
Copy link

catboxanon commented May 14, 2023

I just made a PR here so we don't have to deal with this patching nonsense. AUTOMATIC1111/stable-diffusion-webui#10357

Edit: Merged. Use the dev branch if you want to utilize it before it comes to the master branch.

@moreRGB
Copy link

moreRGB commented Jun 19, 2023

It was merged to the master AUTOMATIC1111/stable-diffusion-webui@cb9a3a7

@ashen-sensored could you please update the readme that the patch is no longer required?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

9 participants