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] Optimize sampler get_logprobs #4594

Merged
merged 9 commits into from
May 8, 2024

Conversation

rkooo567
Copy link
Collaborator

@rkooo567 rkooo567 commented May 4, 2024

get_logprobs happen after sampling, which is the point where GPU <> CPU sync happens. It means overhead from get_logprobs are going to be applied to e2e overhead.

I found get_logprobs is pretty inefficient at large batch size, which could be pretty common. On batch size 256, get_logprobs take about 5~6ms.

This optimizes the get_logprobs. After this, I found the overhead becomes 2.1ms for get_logprobs.

There are 2 optimizations

  • Use non blocking device transfer and call it at the right timing where it can overlap with gpu ops
  • Preselect indices and call tolist() instead of repetitively calling .item (which is much slower)
Throughput benchmark (--input-len 256 --output-len 256)
Before: Throughput: 23.84 requests/s, 12208.54 tokens/s
After: Throughput: 25.77 requests/s, 13196.11 tokens/s

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!

@rkooo567 rkooo567 changed the title [WIP] Optimize sampler get_logprobs [Core] Optimize sampler get_logprobs May 7, 2024
@@ -769,27 +769,24 @@ def _get_logprobs(
selected_logprobs = logprobs[[
query_indices_gpu,
next_token_ids_gpu,
]]
]].to('cpu', non_blocking=True)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

this can overlap device transfer with torch.topk

Copy link
Collaborator

@Yard1 Yard1 left a comment

Choose a reason for hiding this comment

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

LGTM

@rkooo567
Copy link
Collaborator Author

rkooo567 commented May 7, 2024

thanks for the quick review @Yard1 !


# Find prompt/sample logprobs.
prompt_logprobs_per_seq_group: List[Optional[PromptLogprobs]] = []
sample_logprobs_per_seq_group: List[SampleLogprobs] = []
top_logprob_idx = 0
selected_logprobs_idx = 0

# Make sure non-blocking .to("cpu", non_blocking=True) is finished
assert selected_logprobs.shape[0] == ranks.shape[0]
Copy link
Contributor

Choose a reason for hiding this comment

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

@rkooo567 Do we still need this assert since non-blocking transfer code is removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for catching! we don't need comments, but assert is kind of still needed. Removed the comment

Copy link
Collaborator Author

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

Update; non_blocking=True for GPU -> CPU doesn't guarantee to synchronize when tolist() is called, so it is not safe. I used the blocking op instead. This decreases the perf improvement a bit (0.5~ish)


# Find prompt/sample logprobs.
prompt_logprobs_per_seq_group: List[Optional[PromptLogprobs]] = []
sample_logprobs_per_seq_group: List[SampleLogprobs] = []
top_logprob_idx = 0
selected_logprobs_idx = 0

# Make sure non-blocking .to("cpu", non_blocking=True) is finished
assert selected_logprobs.shape[0] == ranks.shape[0]
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for catching! we don't need comments, but assert is kind of still needed. Removed the comment

@simon-mo simon-mo merged commit d7740ea into vllm-project:main May 8, 2024
59 checks passed
z103cb pushed a commit to z103cb/opendatahub_vllm that referenced this pull request May 9, 2024
@davidthomas426
Copy link

Update; non_blocking=True for GPU -> CPU doesn't guarantee to synchronize when tolist() is called, so it is not safe. I used the blocking op instead. This decreases the perf improvement a bit (0.5~ish)

As an alternative, you could use a cuda stream for this and do a stream synchronize before the tolist, or just forget the separate cuda stream and just use a full torch cuda synchronize if that wouldn't create a performance issue.

robertgshaw2-redhat pushed a commit to neuralmagic/nm-vllm that referenced this pull request May 19, 2024
dtrifiro pushed a commit to dtrifiro/vllm that referenced this pull request May 21, 2024
Temirulan pushed a commit to Temirulan/vllm-whisper that referenced this pull request Sep 6, 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.

5 participants