-
Notifications
You must be signed in to change notification settings - Fork 1
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
Stop strings #23
Stop strings #23
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:
🚀 |
vllm/v1/engine/detokenizer.py
Outdated
for engine_core_output in encore_core_outputs: | ||
request_id = engine_core_output.request_id | ||
detokenizer = self.request_states[request_id] |
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.
@njhill I believe this can result in a KeyError
sometimes. This can happen when the LLMEngineCore runs ahead before it gets to process the abort request. What do you think ?
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.
@varun-sundar-rabindranath good catch! I think all that's needed here though is to ignore the case where we no longer have an entry (the request is already completed from our pov and we can discard residual outputs from the engine).
# Stop strings | ||
stop: List[str] | ||
include_stop_str_in_output: bool | ||
|
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.
Is it better to decouple stop-string check and the making of request outputs into different classes ?
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.
@varun-sundar-rabindranath I think the incremental detokenization + stop string handling naturally fits together given the possible buffering / truncation required by the latter.
We could decouple the request output construction (I do agree with the idea of keeping the detokenizer "generic"), but I think we would want to output something quite similar to Optional[RequestOutput]
from the add_tokens
method anyhow I think?
At a minimum we could split that part into a sub-method
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.
@njhill I agree that all three belong together, but they could be different components called one after the other. like the sub-methods you are hinting at.
Concretely, I was thinking we could refactor it like this,
class OutputProcessor:
def __init__(request):
self.stop : List[str] = request.sampling_params.stop
self.include_stop_str: str = request.sampling_params.include_stop_str
self.detokenizer = IncrementalDetokenizer(request)
self.generated_text: str = ""
self.streamed_text_index: int = 0 # text from generted_text has been streamed until streamed_text_index
def check_stop_strings() -> Optional[str]:
"""
if a stop string is identified, return the identified stop string.
"""
...
def make_request_output(engine_core_output, stop_str) -> Optional[RequestOutput]:
"""
make a request output based on RequestOutputKind
"""
def step(engine_core_output) -> Tuple[RequestOutput, bool]:
"""
Process the engine core output and return,
1. request output if the request finished / request output kind delta is enabled
2. to abort request or not to abort requset
"""
new_text = self.Detokenizer(engine_core_output)
self.generated_text += new_text
stop_str = check_stop_strings()
if stop_str:
# this request must be aborted
return self.make_request_output(engine_core_output, stop_str), True
return self.make_request_output(engine_core_output), False
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.
Thanks @varun-sundar-rabindranath I agree and had similar thought re the OutputProcessor
naming. I just think it might still make sense to keep the stop string handling in the incrementaldetokenizer for now (we can still reevaluate that later)
FILL IN THE PR DESCRIPTION HERE
FIX #xxxx (link existing issues this PR will resolve)
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!