Skip to content

Commit f02b113

Browse files
authored
Merge pull request #560 from DrJKL/drjkl/fix/schedule_indices
Fix the scheduling issue with held prompts in prompt interpolation
2 parents a34036b + 8557132 commit f02b113

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

animatediff/scheduling.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,11 @@ def _handle_prompt_interpolation(pairs: list[InputPair], length: int, clip: CLIP
335335
continue
336336
if holder is None:
337337
holder = prev_holder
338-
real_prompt = apply_values_replace_to_prompt(pair.val, i, values_replace=values_replace)
338+
real_prompt = apply_values_replace_to_prompt(holder.raw_prompt, i, values_replace=values_replace)
339339
if holder.prompt != real_prompt:
340340
cond, pooled = clip.encode_from_tokens(clip.tokenize(real_prompt), return_pooled=True)
341341
cond = pad_cond(cond, target_length=max_size)
342-
holder = CondHolder(idx=i, prompt=real_prompt, raw_prompt=pair.val, cond=cond, pooled=pooled, hold=pair.hold)
342+
holder = replace(holder, idx=i, prompt=real_prompt, cond=cond, pooled=pooled)
343343
else:
344344
holder = replace(holder)
345345
holder.idx = i
@@ -380,7 +380,7 @@ def _handle_prompt_interpolation(pairs: list[InputPair], length: int, clip: CLIP
380380
if holder is None or holder.prompt != real_prompt:
381381
cond_to, pooled_to = clip.encode_from_tokens(clip.tokenize(real_prompt), return_pooled=True)
382382
cond_to = pad_cond(cond_to, target_length=max_size)
383-
holder = CondHolder(idx=idx_int, prompt=real_prompt, raw_prompt=pair.val, cond=cond_to, pooled=pooled_to, hold=pair.hold)
383+
holder = CondHolder(idx=pair.idx, prompt=real_prompt, raw_prompt=pair.val, cond=cond_to, pooled=pooled_to, hold=pair.hold)
384384
# calculate interm_holder stuff if needed
385385
real_prompt = apply_values_replace_to_prompt(interm_holder.raw_prompt, idx_int, values_replace=values_replace)
386386
if interm_holder.prompt != real_prompt:

0 commit comments

Comments
 (0)