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

[Hotfix][CI/Build][Kernel] CUDA 11.8 does not support layernorm optimizations #3782

Merged
merged 9 commits into from
Apr 8, 2024

Conversation

mawong-amd
Copy link
Contributor

@mawong-amd mawong-amd commented Apr 1, 2024

This small PR reverts enabling bf16/fp16 conversions and operators on CUDA < 12.0 that was done in #3662 due to clashes with other parts of code. As a result, the layernorm changes in the same PR are also disabled for CUDA < 12.0.

FIX #3662 (comment)


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!

Bulk conversions (packed halfs into half2, using vectors of half2);
block and warp reduce with AMD wavesize 64 (vs 32);
using smaller block sizes for improved block occupancy on CUs

Use larger block sizes for decode; optimize warp and block reduce fully

Refactor vector to use half to maintain same alignment as c10::Half; move packed logic into member functions

Add a few missing unroll directives

Fix blockReduce stall caused by warp divergence on CUDA (vLLM uses universal masks)

Refactor vector type to enable optimizations for bf16

Re-apply the blockReduceSum fix for warp divergence

Hotfix: Disable BF16 opts due to ROCm 5.7 incompatibility

Remove redundant inline specifiers; preparing for upstream
@mawong-amd mawong-amd changed the title [Bugfix][CI/Build][Kernel] CUDA 11.8 does not support layernorm optimizations [Hotfix][Bugfix][CI/Build][Kernel] CUDA 11.8 does not support layernorm optimizations Apr 2, 2024
@mawong-amd
Copy link
Contributor Author

@youkaichao The hotfix for CUDA 11.8 you requested.

@youkaichao youkaichao requested a review from WoosukKwon April 4, 2024 16:53
@youkaichao
Copy link
Member

Thank you. I'm not familiar with cuda yet, so I will hand it over to @WoosukKwon

@mawong-amd mawong-amd changed the title [Hotfix][Bugfix][CI/Build][Kernel] CUDA 11.8 does not support layernorm optimizations [Hotfix][CI/Build][Kernel] CUDA 11.8 does not support layernorm optimizations Apr 5, 2024
@WoosukKwon WoosukKwon self-assigned this Apr 8, 2024
Copy link
Collaborator

@WoosukKwon WoosukKwon left a comment

Choose a reason for hiding this comment

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

@mawong-amd LGTM. Thanks for submitting the fix!

@WoosukKwon WoosukKwon merged commit 59a6abf into vllm-project:main Apr 8, 2024
34 checks passed
SageMoore pushed a commit to neuralmagic/nm-vllm that referenced this pull request Apr 11, 2024
andy-neuma pushed a commit to neuralmagic/nm-vllm that referenced this pull request Apr 12, 2024
@mawong-amd mawong-amd deleted the layernorm2upstream branch April 17, 2024 05:40
z103cb pushed a commit to z103cb/opendatahub_vllm that referenced this pull request Apr 22, 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.

3 participants