1580158
/
sd-webui-controlnet
mirror of https://github.com/Mikubill/sd-webui-controlnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

softer in high-res pass

pull/904/head
lvmin 2023-04-18 20:31:17 -07:00
parent ad709c2575
commit 17d4e2f185
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/hook.py
View File

@ -145,6 +145,8 @@ class UnetHook(nn.Module):
total_extra_cond = torch.zeros([0, context.shape[-1]]).to(devices.get_device_for("controlnet")) total_extra_cond = torch.zeros([0, context.shape[-1]]).to(devices.get_device_for("controlnet"))
only_mid_control = outer.only_mid_control only_mid_control = outer.only_mid_control
require_inpaint_hijack = False require_inpaint_hijack = False
is_in_high_res_fix = False
# handle external cond first # handle external cond first
for param in outer.control_params: for param in outer.control_params:
@ -163,6 +165,7 @@ class UnetHook(nn.Module):
else: else:
# we are in high-res path # we are in high-res path
param.used_hint_cond = param.hr_hint_cond param.used_hint_cond = param.hr_hint_cond
is_in_high_res_fix = True
if param.guidance_stopped or not param.is_extra_cond: if param.guidance_stopped or not param.is_extra_cond:
continue continue
@ -218,12 +221,13 @@ class UnetHook(nn.Module):
uc_mask = param.generate_uc_mask(query_size, dtype=x.dtype, device=x.device)[:, None, None, None] uc_mask = param.generate_uc_mask(query_size, dtype=x.dtype, device=x.device)[:, None, None, None]
control = [c * uc_mask for c in control] control = [c * uc_mask for c in control]
if param.guess_mode: if param.guess_mode or is_in_high_res_fix:
if param.is_adapter: if param.is_adapter:
# see https://github.com/Mikubill/sd-webui-controlnet/issues/269 # see https://github.com/Mikubill/sd-webui-controlnet/issues/269
control_scales = param.weight * [0.25, 0.62, 0.825, 1.0] control_scales = param.weight * [0.25, 0.62, 0.825, 1.0]
else: else:
control_scales = [param.weight * (0.825 ** float(12 - i)) for i in range(13)] control_scales = [param.weight * (0.825 ** float(12 - i)) for i in range(13)]
if param.advanced_weighting is not None: if param.advanced_weighting is not None:
control_scales = param.advanced_weighting control_scales = param.advanced_weighting