aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-12-02 15:03:34 +0000
committerAUTOMATIC1111 <16777216c@gmail.com>2023-12-02 15:03:34 +0000
commita5f61aa8c5933d8e5a0e0aa841138eeaccd86d62 (patch)
tree222189a64f234a22f78b0d9d18bcb4b3e932691a /modules
parent11d23e8ca55c097ecfa255a05b63f194e25f08be (diff)
downloadstable-diffusion-webui-gfx803-a5f61aa8c5933d8e5a0e0aa841138eeaccd86d62.tar.gz
stable-diffusion-webui-gfx803-a5f61aa8c5933d8e5a0e0aa841138eeaccd86d62.tar.bz2
stable-diffusion-webui-gfx803-a5f61aa8c5933d8e5a0e0aa841138eeaccd86d62.zip
potential fix for #14172
Diffstat (limited to 'modules')
-rw-r--r--modules/sd_hijack.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py
index 3d340fc9..14fe62c7 100644
--- a/modules/sd_hijack.py
+++ b/modules/sd_hijack.py
@@ -38,6 +38,10 @@ 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()
@@ -255,9 +259,6 @@ 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,11 +304,6 @@ 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
-
def apply_circular(self, enable):
if self.circular_enabled == enable: