Skip to content
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

[Core] Scheduler perf fix #4270

Merged
merged 6 commits into from
Apr 22, 2024
Merged

[Core] Scheduler perf fix #4270

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31c9e5b
ip
rkooo567 Apr 22, 2024
ac78b77
fix one issue
rkooo567 Apr 22, 2024
cc1b303
,
rkooo567 Apr 22, 2024
d741157
done
rkooo567 Apr 22, 2024
915fdde
done
rkooo567 Apr 22, 2024
0fce8f0
fix test
simon-mo Apr 22, 2024
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
7 changes: 2 additions & 5 deletions vllm/core/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ def num_decoding_tokens_per_seq(self) -> int:

def add_seq_group(self, seq_group: SequenceGroup) -> None:
# Add sequence groups to the waiting queue.
logger.debug(f"add_seq_group {seq_group.request_id}")
self.waiting.append(seq_group)

def abort_seq_group(self, request_id: Union[str, Iterable[str]]) -> None:
Expand Down Expand Up @@ -427,7 +426,6 @@ def _schedule_running(
swapped_out.append(seq_group)
break
else:
logger.debug(f"append slot for {seq_group}")
self._append_slots(seq_group, blocks_to_copy)
is_prefill = seq_group.is_prefill()
if is_prefill:
Expand Down Expand Up @@ -659,7 +657,7 @@ def _schedule_prefills(
if curr_loras is not None and lora_int_id > 0:
curr_loras.add(lora_int_id)
waiting_queue.popleft()
self._allocate_and_set_running(seq_group, num_new_tokens)
self._allocate_and_set_running(seq_group)
seq_groups.append(
ScheduledSequenceGroup(seq_group=seq_group,
token_chunk_size=num_new_tokens))
Expand Down Expand Up @@ -952,8 +950,7 @@ def free_finished_seq_groups(self) -> None:
self.running = deque(seq_group for seq_group in self.running
if not seq_group.is_finished())

def _allocate_and_set_running(self, seq_group: SequenceGroup,
num_new_tokens: int) -> None:
def _allocate_and_set_running(self, seq_group: SequenceGroup) -> None:
self.block_manager.allocate(seq_group)
for seq in seq_group.get_seqs(status=SequenceStatus.WAITING):
seq.status = SequenceStatus.RUNNING
Expand Down
Loading