diff options
| author | Kohaku-Blueleaf <59680068+KohakuBlueleaf@users.noreply.github.com> | 2023-12-03 02:54:54 +0000 |
|---|---|---|
| committer | Kohaku-Blueleaf <59680068+KohakuBlueleaf@users.noreply.github.com> | 2023-12-03 02:54:54 +0000 |
| commit | 9a15ae2a92e55d614fe515cd0a104d90b854b23f (patch) | |
| tree | 7977ea1ea27cfc1d21e652433f8bbc0faec0ddc9 /modules/sd_hijack.py | |
| parent | 50a21cb09fe3e9ea2d4fe058e0484e192c8a86e3 (diff) | |
| parent | ac02216e540cd581f9169c6c791e55721e3117b0 (diff) | |
| download | stable-diffusion-webui-gfx803-9a15ae2a92e55d614fe515cd0a104d90b854b23f.tar.gz stable-diffusion-webui-gfx803-9a15ae2a92e55d614fe515cd0a104d90b854b23f.tar.bz2 stable-diffusion-webui-gfx803-9a15ae2a92e55d614fe515cd0a104d90b854b23f.zip | |
Merge branch 'dev' into test-fp8
Diffstat (limited to 'modules/sd_hijack.py')
| -rw-r--r-- | modules/sd_hijack.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index 3d340fc9..e139d996 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -38,6 +38,13 @@ ldm.models.diffusion.ddpm.print = shared.ldm_print optimizers = []
current_optimizer: sd_hijack_optimizations.SdOptimization = None
+ldm_patched_forward = sd_unet.create_unet_forward(ldm.modules.diffusionmodules.openaimodel.UNetModel.forward)
+ldm_original_forward = patches.patch(__file__, ldm.modules.diffusionmodules.openaimodel.UNetModel, "forward", ldm_patched_forward)
+
+sgm_patched_forward = sd_unet.create_unet_forward(sgm.modules.diffusionmodules.openaimodel.UNetModel.forward)
+sgm_original_forward = patches.patch(__file__, sgm.modules.diffusionmodules.openaimodel.UNetModel, "forward", sgm_patched_forward)
+
+
def list_optimizers():
new_optimizers = script_callbacks.list_optimizers_callback()
@@ -255,9 +262,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 +307,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:
|