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.

Sign up for GitHub

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

Jump to bottom

[Bugfix] Avoid import AttentionMetadata explicitly in Mllama and fix openvino import #10593

Merged
merged 5 commits into from
Nov 23, 2024
Merged

[Bugfix] Avoid import AttentionMetadata explicitly in Mllama and fix openvino import #10593

merged 5 commits into from
Nov 23, 2024

Conversation

Isotr0py
Copy link
Collaborator

@Isotr0py Isotr0py commented Nov 23, 2024 •
edited by github-actions bot
Loading

  • Since mllama is also supported on CPU backend, import FlashAttentionMetadata and XFormersMetadata on CPU backend will cause import error due to missing packages.
  • This PR modifies masked attention implementation selection to use _Backend instead of attn_metadata
  • Also fix broken kernel test due to import openvino

@Isotr0py
avoid import attn metadata explicitly
2166bfe 
Signed-off-by: Isotr0py <2037008807@qq.com>
@Isotr0py
update error message
2f9fad5 
Signed-off-by: Isotr0py <2037008807@qq.com>
@github-actions GitHub Actions
Copy link

👋 Hi! Thank you for contributing to the vLLM project.
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 do one of these:

  • Add ready label to the PR
  • Enable auto-merge.

🚀

@DarkLight1337
Copy link
Member

Hmm, seems that backend_name_to_enum isn't handling v1 properly.

@Isotr0py
fix v1 flash attn get_name
f6cd682 
Signed-off-by: Isotr0py <2037008807@qq.com>
@DarkLight1337 DarkLight1337 enabled auto-merge (squash) November 23, 2024 15:10
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Nov 23, 2024
@Isotr0py
Copy link
Collaborator Author

Seems that #10573 broke the kernel tests.

@Isotr0py
implement get_name for blocksparse attn
945c5b5 
Signed-off-by: Isotr0py <2037008807@qq.com>
@Isotr0py
lazy import openvino
cad6158 
Signed-off-by: Isotr0py <2037008807@qq.com>
@Isotr0py Isotr0py changed the title [Bugfix] Avoid import AttentionMetadata explicitly in Mllama [Bugfix] Avoid import AttentionMetadata explicitly in Mllama and fix openvino import Nov 23, 2024
@DarkLight1337 DarkLight1337 merged commit 04668eb into vllm-project:main Nov 23, 2024
56 checks passed
@Isotr0py Isotr0py deleted the fix-mllama branch November 23, 2024 18:13
@Isotr0py Isotr0py restored the fix-mllama branch November 24, 2024 06:43
@Isotr0py Isotr0py deleted the fix-mllama branch November 24, 2024 06:43
@yisonzhu yisonzhu mentioned this pull request Nov 25, 2024
Merged
@jikunshang
Copy link
Contributor

seems also break hpu code path due to lack of get_name. fix here #10593, please take a look, thanks!

mfournioux pushed a commit to mfournioux/vllm that referenced this pull request Nov 28, 2024
@Isotr0py @mfournioux
[Bugfix] Avoid import AttentionMetadata explicitly in Mllama (vllm-pr…
debe896 
…oject#10593)

Signed-off-by: Isotr0py <2037008807@qq.com>
Signed-off-by: Maxime Fournioux <55544262+mfournioux@users.noreply.github.com>
sleepwalker2017 pushed a commit to sleepwalker2017/vllm that referenced this pull request Dec 13, 2024
@Isotr0py
[Bugfix] Avoid import AttentionMetadata explicitly in Mllama (vllm-pr…
d099d22 
…oject#10593)

Signed-off-by: Isotr0py <2037008807@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DarkLight1337 DarkLight1337 DarkLight1337 approved these changes

@WoosukKwon WoosukKwon Awaiting requested review from WoosukKwon WoosukKwon is a code owner

@robertgshaw2-neuralmagic robertgshaw2-neuralmagic Awaiting requested review from robertgshaw2-neuralmagic robertgshaw2-neuralmagic is a code owner

@njhill njhill Awaiting requested review from njhill njhill is a code owner

@ywang96 ywang96 Awaiting requested review from ywang96 ywang96 is a code owner

@comaniac comaniac Awaiting requested review from comaniac comaniac is a code owner

@alexm-neuralmagic alexm-neuralmagic Awaiting requested review from alexm-neuralmagic alexm-neuralmagic is a code owner

Assignees
No one assigned
Labels
ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Isotr0py @DarkLight1337 @jikunshang