diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-03-25 09:36:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-25 09:36:35 +0000 |
| commit | db7caf9b9cb353fdb92f179a02ba71c923e2dcec (patch) | |
| tree | 93bd1e85103efdb4a2eb8cacf5c022901fd51c43 /modules/sd_hijack_unet.py | |
| parent | e5dd5d73357715110c18c1ac31711f3a81b84a0c (diff) | |
| parent | c1294d849a50b9b2995aa257adbb918837c4b384 (diff) | |
| download | stable-diffusion-webui-gfx803-db7caf9b9cb353fdb92f179a02ba71c923e2dcec.tar.gz stable-diffusion-webui-gfx803-db7caf9b9cb353fdb92f179a02ba71c923e2dcec.tar.bz2 stable-diffusion-webui-gfx803-db7caf9b9cb353fdb92f179a02ba71c923e2dcec.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to 'modules/sd_hijack_unet.py')
| -rw-r--r-- | modules/sd_hijack_unet.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/sd_hijack_unet.py b/modules/sd_hijack_unet.py index 843ab66c..15858263 100644 --- a/modules/sd_hijack_unet.py +++ b/modules/sd_hijack_unet.py @@ -67,7 +67,7 @@ def hijack_ddpm_edit(): unet_needs_upcast = lambda *args, **kwargs: devices.unet_needs_upcast
CondFunc('ldm.models.diffusion.ddpm.LatentDiffusion.apply_model', apply_model, unet_needs_upcast)
CondFunc('ldm.modules.diffusionmodules.openaimodel.timestep_embedding', lambda orig_func, timesteps, *args, **kwargs: orig_func(timesteps, *args, **kwargs).to(torch.float32 if timesteps.dtype == torch.int64 else devices.dtype_unet), unet_needs_upcast)
-if version.parse(torch.__version__) <= version.parse("1.13.1"):
+if version.parse(torch.__version__) <= version.parse("1.13.2") or torch.cuda.is_available():
CondFunc('ldm.modules.diffusionmodules.util.GroupNorm32.forward', lambda orig_func, self, *args, **kwargs: orig_func(self.float(), *args, **kwargs), unet_needs_upcast)
CondFunc('ldm.modules.attention.GEGLU.forward', lambda orig_func, self, x: orig_func(self.float(), x.float()).to(devices.dtype_unet), unet_needs_upcast)
CondFunc('open_clip.transformer.ResidualAttentionBlock.__init__', lambda orig_func, *args, **kwargs: kwargs.update({'act_layer': GELUHijack}) and False or orig_func(*args, **kwargs), lambda _, *args, **kwargs: kwargs.get('act_layer') is None or kwargs['act_layer'] == torch.nn.GELU)
|