diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2024-01-01 13:39:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 13:39:51 +0000 |
| commit | dfd64382211317cc46ad337c373492bfc420fa18 (patch) | |
| tree | 3b1b2f5f3648da07430f54d1c155ce379a6fa3f7 /modules/sd_unet.py | |
| parent | 3d15e58b0a30f2ef1e731f9e429f4d3cf1c259c5 (diff) | |
| parent | 0ce67cb61806cf43f4d726d4705a4f6fdc2540e6 (diff) | |
| download | stable-diffusion-webui-gfx803-dfd64382211317cc46ad337c373492bfc420fa18.tar.gz stable-diffusion-webui-gfx803-dfd64382211317cc46ad337c373492bfc420fa18.tar.bz2 stable-diffusion-webui-gfx803-dfd64382211317cc46ad337c373492bfc420fa18.zip | |
Merge branch 'dev' into feat/interrupted-end
Diffstat (limited to 'modules/sd_unet.py')
| -rw-r--r-- | modules/sd_unet.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/modules/sd_unet.py b/modules/sd_unet.py index 6a7bc9e2..a771849c 100644 --- a/modules/sd_unet.py +++ b/modules/sd_unet.py @@ -5,8 +5,7 @@ from modules import script_callbacks, shared, devices unet_options = []
current_unet_option = None
current_unet = None
-original_forward = None
-
+original_forward = None # not used, only left temporarily for compatibility
def list_unets():
new_unets = script_callbacks.list_unets_callback()
@@ -84,9 +83,12 @@ class SdUnet(torch.nn.Module): pass
-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)
+def create_unet_forward(original_forward):
+ 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 original_forward(self, x, timesteps, context, *args, **kwargs)
- return original_forward(self, x, timesteps, context, *args, **kwargs)
+ return UNetModel_forward
|