aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sd_hijack_unet.py
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-03-25 09:08:24 +0000
committerGitHub <noreply@github.com>2023-03-25 09:08:24 +0000
commit8dbe793af53194ff3054bfbc9529a10f961bdbd3 (patch)
tree087f31c96c6b0280c75cfca4380638cde72ff90e /modules/sd_hijack_unet.py
parent8e3ced73a8c8f435809de544e0574da265177289 (diff)
parent70615448b2ef3285dba9bb1992974cb1eaf10995 (diff)
downloadstable-diffusion-webui-gfx803-8dbe793af53194ff3054bfbc9529a10f961bdbd3.tar.gz
stable-diffusion-webui-gfx803-8dbe793af53194ff3054bfbc9529a10f961bdbd3.tar.bz2
stable-diffusion-webui-gfx803-8dbe793af53194ff3054bfbc9529a10f961bdbd3.zip
Merge branch 'master' into extra-network-info
Diffstat (limited to 'modules/sd_hijack_unet.py')
-rw-r--r--modules/sd_hijack_unet.py2
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)