diff options
| author | MrCheeze <fishycheeze@yahoo.ca> | 2023-12-02 03:56:08 +0000 |
|---|---|---|
| committer | MrCheeze <fishycheeze@yahoo.ca> | 2023-12-02 03:56:08 +0000 |
| commit | 293f44e6c1de7bbf744a4236db81ac4559bdb82a (patch) | |
| tree | ecde64434e817d834bd9193b5d073673f32315b5 /modules/sd_hijack.py | |
| parent | f0f100e67b78f686dc73cf3c8cad422e45cc9b8a (diff) | |
| download | stable-diffusion-webui-gfx803-293f44e6c1de7bbf744a4236db81ac4559bdb82a.tar.gz stable-diffusion-webui-gfx803-293f44e6c1de7bbf744a4236db81ac4559bdb82a.tar.bz2 stable-diffusion-webui-gfx803-293f44e6c1de7bbf744a4236db81ac4559bdb82a.zip | |
Fix bug where is_using_v_parameterization_for_sd2 fails because the sd_hijack is only partially undone
Diffstat (limited to 'modules/sd_hijack.py')
| -rw-r--r-- | modules/sd_hijack.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index 0157e19f..3d340fc9 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -38,9 +38,6 @@ ldm.models.diffusion.ddpm.print = shared.ldm_print optimizers = []
current_optimizer: sd_hijack_optimizations.SdOptimization = None
-ldm_original_forward = patches.patch(__file__, ldm.modules.diffusionmodules.openaimodel.UNetModel, "forward", sd_unet.UNetModel_forward)
-sgm_original_forward = patches.patch(__file__, sgm.modules.diffusionmodules.openaimodel.UNetModel, "forward", sd_unet.UNetModel_forward)
-
def list_optimizers():
new_optimizers = script_callbacks.list_optimizers_callback()
@@ -258,6 +255,9 @@ class StableDiffusionModelHijack: import modules.models.diffusion.ddpm_edit
+ ldm_original_forward = patches.patch(__file__, ldm.modules.diffusionmodules.openaimodel.UNetModel, "forward", sd_unet.UNetModel_forward)
+ sgm_original_forward = patches.patch(__file__, sgm.modules.diffusionmodules.openaimodel.UNetModel, "forward", sd_unet.UNetModel_forward)
+
if isinstance(m, ldm.models.diffusion.ddpm.LatentDiffusion):
sd_unet.original_forward = ldm_original_forward
elif isinstance(m, modules.models.diffusion.ddpm_edit.LatentDiffusion):
@@ -303,6 +303,9 @@ class StableDiffusionModelHijack: self.layers = None
self.clip = None
+ patches.undo(__file__, ldm.modules.diffusionmodules.openaimodel.UNetModel, "forward")
+ patches.undo(__file__, sgm.modules.diffusionmodules.openaimodel.UNetModel, "forward")
+
sd_unet.original_forward = None
|