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

[Core] Scheduling optimization 2 #4280

Merged
merged 8 commits into from
Apr 23, 2024

Conversation

rkooo567
Copy link
Collaborator

This PR adds 2 optimization

I found the main overhead is coming from get_max_num_running_seqs because it needs to create a list of sequences.

This adds 2 optimizations

  1. If status is None, get_num_seqs doesn't have to create a list.
  2. If we already know num_seqs token budget is updated before calling schedule_Running, we allow to skip it from schedule_running. This will skip get_max_num_running_seqs so it improves perf

Before this PR, each iteration on A10 takes 2.67ms (the original scheduler logic takes about 2ms). After 1, it became 2.32.4 ms. After 2, it becomes 2~2.1ms


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.

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!

@@ -849,12 +858,228 @@ def _schedule_chunked_prefill(self):
num_lookahead_slots=running_scheduled.num_lookahead_slots,
)

def _schedule_before_regression(self) -> SchedulerOutputs:
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ignore this func

Copy link
Collaborator

@simon-mo simon-mo left a comment

Choose a reason for hiding this comment

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

LGTM given we just re-use the enable_chunking flag and removing the `before_regression_

@rkooo567 rkooo567 changed the title [wip] Scheduling optimization 2 [Core] Scheduling optimization 2 Apr 23, 2024
@rkooo567
Copy link
Collaborator Author

rkooo567 commented Apr 23, 2024

this commit: Throughput: 24.59 requests/s, 12587.93 tokens/s
before regression: Throughput: 24.92 requests/s, 12757.61 tokens/s
before this commit: Throughput: 24.23 requests/s, 12404.63 tokens/s

So less than 2% diff from before regression after this commit

@simon-mo simon-mo enabled auto-merge (squash) April 23, 2024 02:45
auto-merge was automatically disabled April 23, 2024 04:46

Head branch was pushed to by a user without write access

@rkooo567
Copy link
Collaborator Author

Throughput: 24.80 requests/s, 12699.84 tokens/s

lol I added if opposite when I removed the flag and replaced it to enable_chunk

After fixing this, the perf seems almost identical to before regrssion @simon-mo

@simon-mo simon-mo enabled auto-merge (squash) April 23, 2024 04:58
@simon-mo simon-mo merged commit 050f285 into vllm-project:main Apr 23, 2024
47 checks passed
xjpang pushed a commit to xjpang/vllm that referenced this pull request Apr 25, 2024
robertgshaw2-neuralmagic pushed a commit to neuralmagic/nm-vllm that referenced this pull request Apr 26, 2024
alexeykondrat pushed a commit to alexeykondrat/ci-vllm that referenced this pull request May 1, 2024
z103cb pushed a commit to z103cb/opendatahub_vllm that referenced this pull request May 7, 2024
mawong-amd pushed a commit to ROCm/vllm that referenced this pull request Jun 3, 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.

None yet

2 participants