Skip to content

Conversation

afeldman-nm
Copy link
Contributor

@afeldman-nm afeldman-nm commented Sep 19, 2024

This PR addresses #7968 by disabling multi-step scheduling when best_of>1 is enabled; this is the same approach as was taken in #6138 which disabled speculation for best_of>1. This prevents requests with best_of>1 from failing with an unhandled exception, as is the current case.

Since beam search has been moved outside the engine, this PR causes beam search to fail when it is invoked with multi-step.

FIX #7968 (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

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

🚀

@comaniac
Copy link
Collaborator

I understand the approach but get a bit confused about the code changes. Specifically how the "disabling multi-step when n>1" handled in this PR? Seems like this PR only raises an exception?

@afeldman-nm afeldman-nm marked this pull request as draft September 20, 2024 13:57
@afeldman-nm
Copy link
Contributor Author

Apologies @comaniac forgot to mark this as draft

@afeldman-nm afeldman-nm changed the title [Bugfix] Handle best_of>1 case by disabling multi-step speculation. [Bugfix] Handle best_of>1 case by disabling multi-step scheduling. Sep 23, 2024
@afeldman-nm afeldman-nm changed the title [Bugfix] Handle best_of>1 case by disabling multi-step scheduling. [Bugfix] Handle best_of>1 & use_beam_search by disabling multi-step scheduling. Sep 23, 2024
@afeldman-nm afeldman-nm force-pushed the afeldman-nm/multi_step_best_of branch from 1b5b332 to fe12a95 Compare October 7, 2024 18:48
Copy link
Collaborator

@comaniac comaniac left a comment

Choose a reason for hiding this comment

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

Approved to unblock this PR first. Per offline discussion we still need to change the output processor interface for this feature, but maybe we could have a better argument name.

@comaniac comaniac added the ready ONLY add when PR is ready to merge/full CI is needed label Oct 14, 2024
@njhill
Copy link
Member

njhill commented Oct 16, 2024

@afeldman-nm is this still required given the work to remove the impl of best_of and beam search from the core engine? Another advantage of moving the impl of these outside of the engine is that they should still work with multi-step (though the performance might not be great)

@afeldman-nm afeldman-nm changed the title [Bugfix] Handle best_of>1 & use_beam_search by disabling multi-step scheduling. [Bugfix] Handle best_of>1 by disabling multi-step scheduling; fail is beam search is invoked with multi-step scheduling Oct 17, 2024
@afeldman-nm afeldman-nm changed the title [Bugfix] Handle best_of>1 by disabling multi-step scheduling; fail is beam search is invoked with multi-step scheduling [Bugfix] Handle best_of>1 by disabling multi-step scheduling; fail if beam search is invoked with multi-step scheduling Oct 17, 2024
@afeldman-nm
Copy link
Contributor Author

Hi @njhill can you please point to the PR or other information about the workstream which would move best_of outside of the engine?

@njhill
Copy link
Member

njhill commented Oct 17, 2024

@afeldman-nm this is the one I was thinking of, from @youkaichao: #9302

and #9261

@mergify mergify bot added the frontend label Dec 11, 2024
Copy link

mergify bot commented Dec 11, 2024

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @afeldman-nm.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Dec 11, 2024
@robertgshaw2-redhat robertgshaw2-redhat deleted the afeldman-nm/multi_step_best_of branch January 31, 2025 02:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

frontend needs-rebase ready ONLY add when PR is ready to merge/full CI is needed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Multistep with n>1 Fails

5 participants