This commit is contained in:
lllyasviel
2024-01-28 08:27:43 -08:00
parent 3293b2b8df
commit 31e057e7b3
3 changed files with 16 additions and 1 deletions

View File

@@ -5,6 +5,7 @@ from ldm_patched.modules.controlnet import ControlBase
from ldm_patched.modules.samplers import get_area_and_mult, can_concat_cond, cond_cat
from ldm_patched.modules import model_management
from modules_forge.controlnet import compute_controlnet_weighting
from modules_forge.forge_util import compute_cond_mark
def patched_control_merge(self, control_input, control_output, control_prev, output_dtype):
@@ -151,6 +152,9 @@ def patched_calc_cond_uncond_batch(model, cond, uncond, x_in, timestep, model_op
transformer_options["cond_or_uncond"] = cond_or_uncond[:]
transformer_options["sigmas"] = timestep
cond_mark = compute_cond_mark(cond_or_uncond=cond_or_uncond, sigmas=timestep)
transformer_options["cond_mark"] = cond_mark
c['transformer_options'] = transformer_options
if control is not None: