search

ashen-sensored / sd_webui_SAG

MIT License
236 stars 28 forks source link

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

Open oliverban opened 1 year ago

oliverban commented 1 year ago

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 commented 1 year ago

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 commented 1 year ago

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

papuSpartan commented 1 year ago

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

xcanner commented 1 year ago

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 commented 1 year ago

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 (83d66a6c). 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 commented 1 year ago

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 commented 1 year ago

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

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

moreRGB commented 1 year ago

It was merged to the master https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/cb9a3a7809fc7247360705bca4175ccb59b9288c

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