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.

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

Merged

Conversation

robertgshaw2-neuralmagic
Copy link
Collaborator

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:

  • We adhere to Google Python style guide and Google C++ style guide.
  • Pass all linter checks. Please use format.sh to format your code.
  • The code need to be well-documented to ensure future contributors can easily understand the code.
  • Include sufficient tests to ensure the project to stay correct and robust. This includes both unit tests and integration tests.
  • Please add documentation to 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.

  • Make sure custom ops are registered following PyTorch guidelines: Custom C++ and CUDA Operators and The Custom Operators Manual
  • Custom operations that return 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.
  • Use torch.libary.opcheck() to test the function registration and meta-function for any registered ops. See tests/kernels for examples.
  • When changing the C++ signature of an existing op, the schema must be updated to reflect the changes.
  • If a new custom type is needed, see the following document: Custom Class Support in PT2.

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:

  • After the PR is submitted, the PR will be assigned to a reviewer. Every reviewer will pick up the PRs based on their expertise and availability.
  • After the PR is assigned, the reviewer will provide status update every 2-3 days. If the PR is not reviewed within 7 days, please feel free to ping the reviewer or the vLLM team.
  • After the review, the reviewer will put an 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.
  • Please respond to all comments within a reasonable time frame. If a comment isn't clear or you disagree with a suggestion, feel free to ask for clarification or discuss the suggestion.

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!

Copy link

github-actions bot commented Nov 1, 2024

👋 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.

🚀

for engine_core_output in encore_core_outputs:
request_id = engine_core_output.request_id
detokenizer = self.request_states[request_id]

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 ?

Copy link
Collaborator

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

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 ?

Copy link
Collaborator

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

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
         

Copy link
Collaborator

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)

@robertgshaw2-neuralmagic robertgshaw2-neuralmagic merged commit ed8ef9d into neuralmagic:rework-rs-proto Nov 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants