Skip to content

[Cherry-Pick][BugFix] cp iamge revert bug(#6061) #6066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuanlehome merged 2 commits into from
Jan 16, 2026
Merged

[Cherry-Pick][BugFix] cp iamge revert bug(#6061) #6066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0aaa6a
cp revert bug
kevincheng2 Jan 16, 2026
f4759ef
update code
kevincheng2 Jan 16, 2026
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
19 changes: 18 additions & 1 deletion fastdeploy/engine/sched/resource_manager_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,18 @@ def _get_num_new_tokens(self, request, token_budget):
start_patch_idx = inputs["patch_idx"][-1]
else:
start_patch_idx = inputs["patch_idx"][pre_end_idx]
if (
pre_end_idx > 0
and request.prompt_token_ids[pre_end_idx]
in [
inputs["image_patch_id"],
inputs["video_patch_id"],
inputs["audio_patch_id"],
]
and request.prompt_token_ids[pre_end_idx] != request.prompt_token_ids[pre_end_idx - 1]
):
# It just hit the starting position of the image / video / audio
start_patch_idx -= 1
start_patch_map = inputs["patch_map"][start_patch_idx]
request.image_start = start_patch_map["image_num"]
request.video_start = start_patch_map["video_num"]
Expand Down Expand Up @@ -906,10 +918,15 @@ def revert_chunked_mm_input(self, mm_inputs, matched_token_num):
position.offset // self.config.cache_config.block_size
) * self.config.cache_config.block_size
position_idx -= 1
elif matched_token_num < position.offset:
elif matched_token_num <= position.offset:
position_idx -= 1
elif matched_token_num >= position.offset + position.length:
break
else:
llm_logger.error(
f"revert_chunked_mm_input error, matched_token_num:{matched_token_num} position:{position}, {mm_inputs['mm_positions']}"
)
break
return matched_token_num

def get_prefix_cached_blocks(self, request: Request):
Expand Down
9 changes: 9 additions & 0 deletions tests/v1/test_resource_manager_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,15 @@ def test_revert_chunked_mm_input_after_last_chunk(self):
result = self.manager.revert_chunked_mm_input(mm_inputs, 256)
self.assertEqual(result, 256)

def test_revert_chunked_mm_input_match_image_offset(self):
mm_inputs = {
"mm_positions": [
ImagePosition(offset=64, length=21),
]
}
result = self.manager.revert_chunked_mm_input(mm_inputs, 64)
self.assertEqual(result, 64)


if __name__ == "__main__":
unittest.main()
Loading