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

Jump to bottom

[core] simplify seq group code #9569

Merged
merged 10 commits into from
Oct 24, 2024
Merged

[core] simplify seq group code #9569

merged 10 commits into from
Oct 24, 2024

Conversation

youkaichao
Copy link
Member

many if-else condition will be dead after #9302 . we can prune the code.

@github-actions GitHub Actions
Copy link

👋 Hi! Thank you for contributing to the vLLM project.
Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can do one of these:

  • Add ready label to the PR
  • Enable auto-merge.

🚀

youkaichao
youkaichao commented Oct 22, 2024
View reviewed changes
tests/core/test_chunked_prefill_scheduler.py Outdated
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

previously, we use n > 1 sequence group to trigger swapping. since we don't have n>1 sequence group now, swapping-related tests can be removed.

youkaichao
youkaichao commented Oct 22, 2024
View reviewed changes
vllm/engine/llm_engine.py
Comment on lines +653 to +666
if isinstance(params, SamplingParams) and params.n > 1:
ParallelSampleSequenceGroup.add_request(
request_id,
self,
params,
processed_inputs=processed_inputs,
arrival_time=arrival_time,
lora_request=lora_request,
trace_headers=trace_headers,
prompt_adapter_request=prompt_adapter_request,
priority=priority,
)
return None

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move the implementation from add_request to _add_processed_request , so that async llm engine can also enjoy the benefit.

youkaichao
youkaichao commented Oct 22, 2024
View reviewed changes
vllm/engine/output_processor/single_step.py
Comment on lines -140 to -144
# TODO: Add support for async for beam search
assert not is_async

# Process samples
samples = outputs.samples
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed large chunk of dead code

youkaichao
youkaichao commented Oct 22, 2024
View reviewed changes
vllm/sequence.py
Comment on lines -708 to -710
# All sequences in the group should have the same prompt.
# We use the prompt of an arbitrary sequence.
return self.seqs[0].prompt
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

simplify code, self.first_seq.prompt is faster than self.seqs[0] .

more optimizations of this kind will come later.

@youkaichao youkaichao added the ready ONLY add when PR is ready to merge/full CI is needed label Oct 22, 2024
zhuohan123
zhuohan123 approved these changes Oct 24, 2024
View reviewed changes
Copy link
Member

@zhuohan123 zhuohan123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve to unblock the future development. Left some small comments.

@youkaichao youkaichao merged commit 4fdc581 into vllm-project:main Oct 24, 2024
18 of 25 checks passed
@youkaichao youkaichao deleted the simplify_code branch October 24, 2024 07:16
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
@youkaichao @zhuohan123 @Alvant
[core] simplify seq group code (vllm-project#9569)
50cd76a 
Co-authored-by: Zhuohan Li <[email protected]>
MErkinSag pushed a commit to MErkinSag/vllm that referenced this pull request Oct 26, 2024
@youkaichao @zhuohan123
[core] simplify seq group code (vllm-project#9569)
e649969 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: Erkin Sagiroglu <[email protected]>
cooleel pushed a commit to cooleel/vllm that referenced this pull request Oct 28, 2024
@youkaichao @zhuohan123 @cooleel
[core] simplify seq group code (vllm-project#9569)
cda37f3 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: Shanshan Wang <[email protected]>
cooleel pushed a commit to cooleel/vllm that referenced this pull request Oct 28, 2024
@youkaichao @zhuohan123 @cooleel
[core] simplify seq group code (vllm-project#9569)
683e33a 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: Shanshan Wang <[email protected]>
FerdinandZhong pushed a commit to FerdinandZhong/vllm that referenced this pull request Oct 29, 2024
@youkaichao @zhuohan123 @FerdinandZhong
[core] simplify seq group code (vllm-project#9569)
a432846 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: qishuai <[email protected]>
NickLucche pushed a commit to NickLucche/vllm that referenced this pull request Oct 31, 2024
@youkaichao @zhuohan123 @NickLucche
[core] simplify seq group code (vllm-project#9569)
6f64dca 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: NickLucche <[email protected]>
NickLucche pushed a commit to NickLucche/vllm that referenced this pull request Oct 31, 2024
@youkaichao @zhuohan123 @NickLucche
[core] simplify seq group code (vllm-project#9569)
7aa79b0 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: NickLucche <[email protected]>
sumitd2 pushed a commit to sumitd2/vllm that referenced this pull request Nov 14, 2024
@youkaichao @zhuohan123 @sumitd2
[core] simplify seq group code (vllm-project#9569)
ccc04ef 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: Sumit Dubey <[email protected]>
KuntaiDu pushed a commit to KuntaiDu/vllm that referenced this pull request Nov 20, 2024
@youkaichao @zhuohan123
[core] simplify seq group code (vllm-project#9569)
9b4734e 
Co-authored-by: Zhuohan Li <[email protected]>
mfournioux pushed a commit to mfournioux/vllm that referenced this pull request Nov 20, 2024
@youkaichao @zhuohan123 @mfournioux
[core] simplify seq group code (vllm-project#9569)
92b3b9b 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: Maxime Fournioux <[email protected]>
tlrmchlsmth pushed a commit to neuralmagic/vllm that referenced this pull request Nov 23, 2024
@youkaichao @zhuohan123 @tlrmchlsmth
[core] simplify seq group code (vllm-project#9569)
d17cdf0 
Co-authored-by: Zhuohan Li <[email protected]>
Signed-off-by: Tyler Michael Smith <[email protected]>
@andylolu2 andylolu2 mentioned this pull request Jan 9, 2025
Merged
@toslunar toslunar mentioned this pull request Feb 19, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhuohan123 zhuohan123 zhuohan123 approved these changes

@WoosukKwon WoosukKwon Awaiting requested review from WoosukKwon

@alexm-redhat alexm-redhat Awaiting requested review from alexm-redhat alexm-redhat is a code owner

@comaniac comaniac Awaiting requested review from comaniac comaniac is a code owner

@njhill njhill Awaiting requested review from njhill njhill is a code owner

Assignees
No one assigned
Labels
ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@youkaichao @zhuohan123