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

[Bugfix] Massage MLA's usage of flash attn for RoCM #13310

Merged
merged 3 commits into from
Feb 15, 2025

Conversation

tlrmchlsmth
Copy link
Collaborator

@tlrmchlsmth tlrmchlsmth commented Feb 14, 2025

This PR massages some vllm_flash_attn vs flash_attn interface differences that appeared between a couple of PRs:

#12662 added a this fallback to flash_attn in order to support MLA on RoCM:

try:
from vllm.vllm_flash_attn import flash_attn_varlen_func
except ImportError:
from flash_attn import flash_attn_varlen_func

Subsequently #12807 updated to use the vllm_flash_attn specific arguments that control whether we use FA2 or FA3.

Signed-off-by: Tyler Michael Smith <[email protected]>
Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

Signed-off-by: Tyler Michael Smith <[email protected]>
@mgoin mgoin added bug Something isn't working ready ONLY add when PR is ready to merge/full CI is needed AMD GPU labels Feb 14, 2025
@tlrmchlsmth tlrmchlsmth enabled auto-merge (squash) February 14, 2025 23:27
@simon-mo simon-mo merged commit 97a3d6d into vllm-project:main Feb 15, 2025
53 of 60 checks passed
Sakalya pushed a commit to Sakalya/vllm that referenced this pull request Feb 15, 2025
panf2333 pushed a commit to yottalabsai/vllm that referenced this pull request Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AMD GPU bug Something isn't working ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants