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

[Misc] LoRA + Chunked Prefill #9057

Merged
merged 16 commits into from
Dec 11, 2024
Merged

Conversation

aurickq
Copy link
Contributor

@aurickq aurickq commented Oct 3, 2024

Make LoRA work with chunked prefill, taking the same approach as #4994 but updated to latest code.

Also needed to modify the request sorting by the scheduler so prefill sequences always precede decoding sequences.

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 Oct 3, 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.

🚀

@NickLucche
Copy link
Contributor

I believe putting all prefill requests first will break the Prefill/Decode ratio assumption as introduced here https://arxiv.org/abs/2308.16369, favoring memory-bound operations ends up in decreased throughput.

I am afraid I can't gather a lot of context from this PR, why is it needed to put prefills first here (converging to the default non-chunked scheduler policy)?

@aurickq
Copy link
Contributor Author

aurickq commented Oct 4, 2024

I believe putting all prefill requests first will break the Prefill/Decode ratio assumption as introduced here https://arxiv.org/abs/2308.16369, favoring memory-bound operations ends up in decreased throughput.

I am afraid I can't gather a lot of context from this PR, why is it needed to put prefills first here (converging to the default non-chunked scheduler policy)?

My top-level comment was a bit ambiguous. The sorting is applied to the sequences within each batch, not in the scheduling queue, so it should not affect the ability to batch together prefill and decode sequences.

Copy link
Collaborator

@rkooo567 rkooo567 left a comment

Choose a reason for hiding this comment

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

nit comments!

tests/lora/test_chatglm3.py Outdated Show resolved Hide resolved
vllm/core/scheduler.py Outdated Show resolved Hide resolved
@aurickq aurickq force-pushed the lora-chunked-prefill branch from 8812882 to ae18da2 Compare October 23, 2024 20:27
@comaniac comaniac added action-required ready ONLY add when PR is ready to merge/full CI is needed and removed action-required labels Oct 24, 2024
@mces89
Copy link

mces89 commented Dec 5, 2024

Hi, Can I ask when this pr can be merged so we can use this lora+chunked_prefill as soon as possible.

@kouroshHakha
Copy link

Hi @aurickq , awesome that you are working on this. Do you have an estimate on when this will be pushed over to finish line? Is this waiting on review or is there more blockers?

@aurickq
Copy link
Contributor Author

aurickq commented Dec 10, 2024

@mces89 @kouroshHakha I rebased and all the tests are passing, just waiting for someone to merge it now. Perhaps @rkooo567 @simon-mo ?

@jeejeelee jeejeelee merged commit d5c5154 into vllm-project:main Dec 11, 2024
56 of 57 checks passed
@jeejeelee
Copy link
Collaborator

@aurickq Thanks for your contribution and patience

Akshat-Tripathi pushed a commit to krai/vllm that referenced this pull request Dec 12, 2024
sleepwalker2017 pushed a commit to sleepwalker2017/vllm that referenced this pull request Dec 13, 2024
BKitor pushed a commit to BKitor/vllm that referenced this pull request Dec 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

7 participants