diff options
| author | Kohaku-Blueleaf <59680068+KohakuBlueleaf@users.noreply.github.com> | 2023-08-05 05:12:37 +0000 |
|---|---|---|
| committer | Kohaku-Blueleaf <59680068+KohakuBlueleaf@users.noreply.github.com> | 2023-08-05 05:12:37 +0000 |
| commit | d56a9cfe6a0611465d01e6881f79c2d9128744de (patch) | |
| tree | 05878010fb1b638a0c6454fcff197fb0df3d4b93 /modules/sd_hijack.py | |
| parent | a6b245e46f28efe013637e5e9b0600b88df79dc9 (diff) | |
| parent | a32f270a4758597ff97dfc55894e3cacf118ce5c (diff) | |
| download | stable-diffusion-webui-gfx803-d56a9cfe6a0611465d01e6881f79c2d9128744de.tar.gz stable-diffusion-webui-gfx803-d56a9cfe6a0611465d01e6881f79c2d9128744de.tar.bz2 stable-diffusion-webui-gfx803-d56a9cfe6a0611465d01e6881f79c2d9128744de.zip | |
Merge branch 'dev' into efficient-vae-methods
Diffstat (limited to 'modules/sd_hijack.py')
| -rw-r--r-- | modules/sd_hijack.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index 609fd56c..9ad98199 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -5,7 +5,7 @@ from types import MethodType from modules import devices, sd_hijack_optimizations, shared, script_callbacks, errors, sd_unet
from modules.hypernetworks import hypernetwork
from modules.shared import cmd_opts
-from modules import sd_hijack_clip, sd_hijack_open_clip, sd_hijack_unet, sd_hijack_xlmr, xlmr
+from modules import sd_hijack_clip, sd_hijack_open_clip, sd_hijack_unet, sd_hijack_xlmr, xlmr, sd_hijack_inpainting
import ldm.modules.attention
import ldm.modules.diffusionmodules.model
@@ -29,8 +29,12 @@ ldm.modules.attention.MemoryEfficientCrossAttention = ldm.modules.attention.Cros ldm.modules.attention.BasicTransformerBlock.ATTENTION_MODES["softmax-xformers"] = ldm.modules.attention.CrossAttention
# silence new console spam from SD2
-ldm.modules.attention.print = lambda *args: None
-ldm.modules.diffusionmodules.model.print = lambda *args: None
+ldm.modules.attention.print = shared.ldm_print
+ldm.modules.diffusionmodules.model.print = shared.ldm_print
+ldm.util.print = shared.ldm_print
+ldm.models.diffusion.ddpm.print = shared.ldm_print
+
+sd_hijack_inpainting.do_inpainting_hijack()
optimizers = []
current_optimizer: sd_hijack_optimizations.SdOptimization = None
|