diff options
| author | hako-mikan <122196982+hako-mikan@users.noreply.github.com> | 2024-02-09 14:17:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 14:17:40 +0000 |
| commit | 0bc7867ccd4ac24f5f270cb767c4642d0a0c001c (patch) | |
| tree | 2ad13a0cf77bc189a8c9097bd507f9674f993da6 /modules/sd_unet.py | |
| parent | 816096e642187a18b11e2729c42c0b5f677f047d (diff) | |
| parent | cf2772fab0af5573da775e7437e6acdca424f26e (diff) | |
| download | stable-diffusion-webui-gfx803-0bc7867ccd4ac24f5f270cb767c4642d0a0c001c.tar.gz stable-diffusion-webui-gfx803-0bc7867ccd4ac24f5f270cb767c4642d0a0c001c.tar.bz2 stable-diffusion-webui-gfx803-0bc7867ccd4ac24f5f270cb767c4642d0a0c001c.zip | |
Merge branch 'AUTOMATIC1111:master' into master
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
|