Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions invokeai/backend/flux2/denoise.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,15 @@ def denoise(

# Apply inpainting merge at each step
if inpaint_extension is not None:
img = inpaint_extension.merge_intermediate_latents_with_init_latents(img, t_prev)
# Separate the generated latents from the reference conditioning
gen_img = img[:, :original_seq_len, :]
ref_img = img[:, original_seq_len:, :]

# Merge only the generated part
gen_img = inpaint_extension.merge_intermediate_latents_with_init_latents(gen_img, t_prev)

# Concatenate back together
img = torch.cat([gen_img, ref_img], dim=1)

# For Heun, only increment user step after second-order step completes
if is_heun:
Expand Down Expand Up @@ -239,8 +247,19 @@ def denoise(

# Apply inpainting merge at each step
if inpaint_extension is not None:
img = inpaint_extension.merge_intermediate_latents_with_init_latents(img, t_prev)
preview_img = inpaint_extension.merge_intermediate_latents_with_init_latents(preview_img, 0.0)
# Separate the generated latents from the reference conditioning
gen_img = img[:, :original_seq_len, :]
ref_img = img[:, original_seq_len:, :]

# Merge only the generated part
gen_img = inpaint_extension.merge_intermediate_latents_with_init_latents(gen_img, t_prev)

# Concatenate back together
img = torch.cat([gen_img, ref_img], dim=1)

# Handling preview images
preview_gen = preview_img[:, :original_seq_len, :]
preview_gen = inpaint_extension.merge_intermediate_latents_with_init_latents(preview_gen, 0.0)

# Extract only the generated image portion for preview (exclude reference images)
callback_latents = preview_img[:, :original_seq_len, :] if img_cond_seq is not None else preview_img
Expand Down