Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Kernel] Refactor CUTLASS kernels to always take scales that reside on the GPU #5137

Merged

Conversation

tlrmchlsmth
Copy link
Collaborator

This PR smooths out the way the kernels handle per tensor vs per token (or per output channel) scales. Previously, the CUTLASS epilogues needed to be passed a float* for the per-token case and a float for the per-tensor case. The code that called the CUTLASS GEMMs handled this by taking torch::tensors as arguments and unpacking them, calling tensor.item on the scales for the per-tensor case. This was problematic for a few reasons:

  • This caused a performance hazard where the scales needed to be on the GPU for the per-token case, but wanted to be on the CPU for the per-tensor case to avoid a synchronization.
  • Having some tensors on the GPU and other tensors on the CPU breaks torch.compile
  • Calling torch.item at all breaks CUDA graphs.

In order to fix this, I've further modified the CUTLASS epilogue code that loads and broadcasts the scales to always take a float*, and added a bool to indicate if the load should be broadcasting a vector or a scalar.


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!

@tlrmchlsmth tlrmchlsmth force-pushed the tms/cutlass_scale_fixes branch from 033156e to 07d1278 Compare May 30, 2024 15:52
@tlrmchlsmth tlrmchlsmth marked this pull request as ready for review May 30, 2024 16:08
Copy link
Contributor

@bnellnm bnellnm left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@pcmoritz pcmoritz left a comment

Choose a reason for hiding this comment

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

The change looks good to me overall.

Before we merge this, I have an ask: Can you remove the spurious formatting changes of broadcast_load_epilogue_c2x.hpp in this PR and also for broadcast_load_epilogue_c3x.hpp compared to upstream? Keeping these files close to upstream will be crucial to make the code readable and incorporate any future changes from upstream. In particular, we should not be running clang format on these files and exclude them from clang-format.

@tlrmchlsmth
Copy link
Collaborator Author

@pcmoritz You are right -- I'll revert the formatting changes

@tlrmchlsmth
Copy link
Collaborator Author

Going to redo those files from upstream one more time since I'm seeing a bit of drift -- we should be rigorous about keeping track of what version of CUTLASS they come from, so I'll grab them from 3.5

@tlrmchlsmth
Copy link
Collaborator Author

I think this should be good to go now

Copy link
Collaborator

@pcmoritz pcmoritz left a comment

Choose a reason for hiding this comment

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

Nice, thanks for the modifications :)

@robertgshaw2-redhat robertgshaw2-redhat enabled auto-merge (squash) June 1, 2024 01:58
@robertgshaw2-redhat robertgshaw2-redhat merged commit 260d119 into vllm-project:main Jun 1, 2024
65 checks passed
@robertgshaw2-redhat robertgshaw2-redhat deleted the tms/cutlass_scale_fixes branch June 1, 2024 06:45
blinkbear pushed a commit to blinkbear/vllm that referenced this pull request Jun 3, 2024
robertgshaw2-redhat pushed a commit to neuralmagic/nm-vllm that referenced this pull request Jun 11, 2024
joerunde pushed a commit to joerunde/vllm that referenced this pull request Jun 17, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jun 27, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jul 8, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jul 24, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants