-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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.
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
[Frontend, Core] Adding stop and stop_token_ids for beam search. #9264
Conversation
👋 Hi! Thank you for contributing to the vLLM project. 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:
🚀 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if not all_beams: | ||
break |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this a bug?
Better to move it a couple of lines up and use if not new_beams
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll be honest I got confused by the similar check in llm.py
and decided to do something similar here. Not sure if it is needed, and we can do as you say, or we can leave it outside altogether.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK thanks, I guess we should figure out which is correct based on the prior/expected behavior...
@njhill thanks for your input, yes, I'll wait. I've decided to clarify the |
@njhill hello, I've made some changes post-merge. The PR is updated to reflect that. I honestly don't know if as is this is acceptable -- we can try thinking on excluding the tokens or strings from the output, but as I said this is how it was currently done with |
@@ -80,7 +82,10 @@ async def beam_search( | |||
|
|||
beam_search_params = SamplingParams(logprobs=2 * beam_width, | |||
max_tokens=1, | |||
temperature=temperature) | |||
temperature=temperature, | |||
ignore_eos=ignore_eos, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
here and below, not sure if informing the beam_search_params of ignore_eos
does anything, since it did not produce the "stop"
finish reason as I expected.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok after some more testing this is actually necessary -- otherwise the eos
ignoring is not happening fully.
The stop logic seems a bit convoluted -- but I think there is an issue with |
This pull request has merge conflicts that must be resolved before it can be |
This PR is too away from the current branch so I'll close it. Not exactly sure that all the beam search issues were addressed, so maybe a new PR might be needed. |
An attempted fix to #9253
Update 15/10: PR updated post-merge of beam search methods.
eos
check led to no stopping in chat modes, I keep it as it is.eos
; as a consequence the chat mode is notclean
)if not all beams
since at the moment I do not really understand if they do anything.Offline tests
Online tests
Original PR
The new beam search lacks any information about stop or stop_token_ids, this is my attempt to integrate it. The basic idea is to add these options to SamplingParams, generate the next token with them in mind and then do the stop check.eos
token check in the original code. It is integrated into the SamplingParams for 1-token gen but perhaps this is a false step.logging.info
were removed since they seem to be excessive. Even now, the engines tend to spit out the requests at the end even with--disable-log-requests
@youkaichao @LunrEclipse
BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE
PR Checklist (Click to Expand)
Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.
PR Title and Classification
Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:
[Bugfix]
for bug fixes.[CI/Build]
for build or continuous integration improvements.[Doc]
for documentation fixes and improvements.[Model]
for adding a new model or improving an existing model. Model name should appear in the title.[Frontend]
For changes on the vLLM frontend (e.g., OpenAI API server,LLM
class, etc.)[Kernel]
for changes affecting CUDA kernels or other compute kernels.[Core]
for changes in the core vLLM logic (e.g.,LLMEngine
,AsyncLLMEngine
,Scheduler
, etc.)[Hardware][Vendor]
for hardware-specific changes. Vendor name should appear in the prefix (e.g.,[Hardware][AMD]
).[Misc]
for PRs that do not fit the above categories. Please use this sparingly.Note: If the PR spans more than one category, please include all relevant prefixes.
Code Quality
The PR need to meet the following code quality standards:
format.sh
to format your code.docs/source/
if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.Adding or changing kernels
Each custom kernel needs a schema and one or more implementations to be registered with PyTorch.
Tensors
require meta-functions. Meta-functions should be implemented and registered in python so that dynamic dims can be handled automatically. See above documents for a description of meta-functions.torch.libary.opcheck()
to test the function registration and meta-function for any registered ops. Seetests/kernels
for examples.Notes for Large Changes
Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with
rfc-required
and might not go through the PR.What to Expect for the Reviews
The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:
action-required
label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.Thank You
Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!