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

[AMD][Hardware][Misc][Bugfix] xformer cleanup and light navi logic and CI fixes and refactoring #4129

Merged
merged 6 commits into from
Apr 22, 2024

Conversation

hongxiayang
Copy link
Contributor

@hongxiayang hongxiayang commented Apr 16, 2024

This PR is
(1) to remove xformer package and patches since right now raw flash attention api is called instead of using xformers wrapper.
(2) to facilitate gfx1100/navi3x to use triton flash-attn.
(3) still make it possible for other gfx target to use flash-attn and updated the flash-attention branch.

(4) fixed the CI failure for "basic correctness" issue on cuda env

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.

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!

@hongxiayang hongxiayang changed the title Xformer cleanup and light fix and refactoring [AMD][ROCM][MISC] xformer cleanup and light fix and refactoring Apr 17, 2024
@hongxiayang hongxiayang changed the title [AMD][ROCM][MISC] xformer cleanup and light fix and refactoring [AMD][ROCM][MISC][BUGFIX] xformer cleanup and light fix and refactoring Apr 17, 2024
@hongxiayang hongxiayang marked this pull request as ready for review April 17, 2024 16:29
@hongxiayang hongxiayang changed the title [AMD][ROCM][MISC][BUGFIX] xformer cleanup and light fix and refactoring [AMD][Hardware][Misc][Bugfix] xformer cleanup and light fix and refactoring Apr 17, 2024
@hongxiayang
Copy link
Contributor Author

I could not reproduce the failed "Basic Correctness Test" shown in the CI when running in my dev environment.

@hliuca
Copy link
Contributor

hliuca commented Apr 20, 2024

I could not reproduce the failed "Basic Correctness Test" shown in the CI when running in my dev environment.

It looks the testing env using CUDA version Triton, not from ROCm?

pip uninstall -y triton
&& git clone https://github.com/ROCm/triton.git
&& cd triton/python
&& pip3 install .
&& cd ../

@WoosukKwon WoosukKwon self-assigned this Apr 21, 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.

LGTM! Thanks for the PR!

@WoosukKwon
Copy link
Collaborator

@hongxiayang Could you please fix the CI error? It seems the error log is saying that there's a problem in Triton, maybe the issue @hliuca pointed out.

@hongxiayang
Copy link
Contributor Author

hongxiayang commented Apr 22, 2024

@hongxiayang Could you please fix the CI error? It seems the error log is saying that there's a problem in Triton, maybe the issue @hliuca pointed out.

@WoosukKwon Checking. One difference I saw between the CI and my dev env is that python version is different:
in my dev env, triton is installed in below directory (note the python version is 3.9):

/opt/conda/envs/py_3.9/lib/python3.9/site-packages

while in CI, the error showed it used triton in python3.10:
image

<html>
<body>
<!--StartFragment-->
/usr/local/lib/python3.10/dist-packages/triton/runtime/autotuner.py:110: in kernel_call
--
  | self.fn.run(
  | /usr/local/lib/python3.10/dist-packages/triton/runtime/jit.py:426: in run

<!--EndFragment-->
</body>
</html>

Not sure what caused the difference yet.

@hongxiayang
Copy link
Contributor Author

@WoosukKwon Does the CI build docker using Dockerfile instead of Dockerfile.rocm?
image

Maybe this is the CI setup issue?

@hongxiayang
Copy link
Contributor Author

hongxiayang commented Apr 22, 2024

@WoosukKwon Inspecting more in the raw log, we can see it is build for CUDA, not ROCm:
image

But, later from the log, it selected ROCmFlashAttention backend.
And checking more logs showed below:

image

It seems that all backends were tested for a "CUDA" machine since it used cuda's nccl? Maybe the CI setup problem should be addressed in a different PR?

@hongxiayang
Copy link
Contributor Author

@WoosukKwon This line:

- VLLM_ATTENTION_BACKEND=ROCM_FLASH pytest -v -s basic_correctness/test_basic_correctness.py

Should I remove it in this PR?

@hongxiayang hongxiayang changed the title [AMD][Hardware][Misc][Bugfix] xformer cleanup and light fix and refactoring [AMD][Hardware][Misc][Bugfix] xformer cleanup and light navi logic and CI fixes and refactoring Apr 22, 2024
@WoosukKwon
Copy link
Collaborator

@hongxiayang LGTM! As you found, I think the tests were added by mistake and the CI happened to pass the tests because the ROCm Flash backend used to use naive attention for L4 (compute capability 8.9). I think we should skip these CI tests for AMD GPUs for now.

@WoosukKwon WoosukKwon merged commit 95e5b08 into vllm-project:main Apr 22, 2024
46 checks passed
ZackBradshaw pushed a commit to ZackBradshaw/vllm that referenced this pull request Apr 22, 2024
ZackBradshaw pushed a commit to ZackBradshaw/vllm that referenced this pull request Apr 22, 2024
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
@jfactory07
Copy link

jfactory07 commented Jun 5, 2024

hi @hongxiayang

Did you see the performance has uplift after enabling triton flash-attn.

According to my test result on Navi31 triton's flash-attn is slower than naive-attn. I used 0.4.1+rocm603 + triton 2.1.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants