aboutsummaryrefslogtreecommitdiffstats
path: root/modules/sd_hijack_unet.py
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-04-29 10:10:46 +0000
committerGitHub <noreply@github.com>2023-04-29 10:10:46 +0000
commit87535fcf292af8890520e7f346df0f41dd74353a (patch)
tree89c7f9ac26ae637f22f2db1efe69fb4aa51e9c70 /modules/sd_hijack_unet.py
parent02e351880796422eac3bbaf7aa86332b588651ce (diff)
parent1ffb44b0b2c9cb5fb379274515772741a9c1dbaf (diff)
downloadstable-diffusion-webui-gfx803-87535fcf292af8890520e7f346df0f41dd74353a.tar.gz
stable-diffusion-webui-gfx803-87535fcf292af8890520e7f346df0f41dd74353a.tar.bz2
stable-diffusion-webui-gfx803-87535fcf292af8890520e7f346df0f41dd74353a.zip
Merge branch 'dev' into Branch_AddNewFilenameGen
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)