diff options
| author | CodeHatchling <steve@codehatch.com> | 2023-12-03 04:14:02 +0000 |
|---|---|---|
| committer | CodeHatchling <steve@codehatch.com> | 2023-12-03 04:14:02 +0000 |
| commit | 3bd3a091604a332de6ff249870dabd2a91215499 (patch) | |
| tree | 0323625627748ee44fc192bb2496585a4db56b5a /modules/sd_unet.py | |
| parent | bb04d400c95df01d191ef6c1a43e66b95425fa33 (diff) | |
| parent | f0f100e67b78f686dc73cf3c8cad422e45cc9b8a (diff) | |
| download | stable-diffusion-webui-gfx803-3bd3a091604a332de6ff249870dabd2a91215499.tar.gz stable-diffusion-webui-gfx803-3bd3a091604a332de6ff249870dabd2a91215499.tar.bz2 stable-diffusion-webui-gfx803-3bd3a091604a332de6ff249870dabd2a91215499.zip | |
Merge remote-tracking branch 'origin/dev' into soft-inpainting
# Conflicts:
# modules/processing.py
Diffstat (limited to 'modules/sd_unet.py')
| -rw-r--r-- | modules/sd_unet.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/sd_unet.py b/modules/sd_unet.py index 5525cfbc..6a7bc9e2 100644 --- a/modules/sd_unet.py +++ b/modules/sd_unet.py @@ -1,11 +1,11 @@ import torch.nn
-import ldm.modules.diffusionmodules.openaimodel
from modules import script_callbacks, shared, devices
unet_options = []
current_unet_option = None
current_unet = None
+original_forward = None
def list_unets():
@@ -88,5 +88,5 @@ def UNetModel_forward(self, x, timesteps=None, context=None, *args, **kwargs): if current_unet is not None:
return current_unet.forward(x, timesteps, context, *args, **kwargs)
- return ldm.modules.diffusionmodules.openaimodel.copy_of_UNetModel_forward_for_webui(self, x, timesteps, context, *args, **kwargs)
+ return original_forward(self, x, timesteps, context, *args, **kwargs)
|