Skip to content

[Attention] Update attention imports#29540

Merged
yewentao256 merged 3 commits intovllm-project:mainfrom
MatthewBonanni:attention_imports
Nov 27, 2025
Merged

[Attention] Update attention imports#29540
yewentao256 merged 3 commits intovllm-project:mainfrom
MatthewBonanni:attention_imports

Conversation

@MatthewBonanni
Copy link
Copy Markdown
Collaborator

@MatthewBonanni MatthewBonanni commented Nov 26, 2025 •
edited by github-actions bot
Loading

Purpose

Now that #29342 has landed, many of the TYPE_CHECKING and lazy imports are no longer necessary. This PR updates them throughout the codebase

Test Plan

Recommend to run all CI tests (ready-run-all-tests)

Test Result

Essential Elements of an Effective PR Description Checklist
  • The purpose of the PR, such as "Fix some issue (link existing issues this PR will resolve)".
  • The test plan, such as providing test command.
  • The test results, such as pasting the results comparison before and after, or e2e results
  • (Optional) The necessary documentation update, such as updating supported_models.md and examples for a new model.
  • (Optional) Release notes update. If your change is user facing, please update the release notes draft in the Google Doc.

@MatthewBonanni
update attention imports
c0a7a0a 
Signed-off-by: Matthew Bonanni <mbonanni@redhat.com>
@chatgpt-codex-connector
Copy link
Copy Markdown

chatgpt-codex-connector bot commented Nov 26, 2025

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.

@mergify mergify bot added nvidia rocm Related to AMD ROCm speculative-decoding labels Nov 26, 2025
@mergify mergify bot added v1 tpu Related to Google TPUs labels Nov 26, 2025
@mergify mergify bot added the kv-connector label Nov 26, 2025
gemini-code-assist[bot]
gemini-code-assist bot reviewed Nov 26, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request is a large-scale refactoring that removes lazy imports and TYPE_CHECKING blocks related to attention backends throughout the codebase. The changes are consistent and correctly applied, moving imports to the top level and updating type hints accordingly. This cleanup improves code readability and structure. I have reviewed all the changes and found no issues. The refactoring appears to be safe and well-executed.

@MatthewBonanni
Copy link
Copy Markdown
Collaborator Author

MatthewBonanni commented Nov 26, 2025

cc @mgoin

@MatthewBonanni
fix circular import
6620e9e 
Signed-off-by: Matthew Bonanni <mbonanni@redhat.com>
yewentao256
yewentao256 reviewed Nov 26, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@yewentao256 yewentao256 left a comment

Choose a reason for hiding this comment

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

Thanks for the work! Let's run CI and see if we can pass

@yewentao256 yewentao256 added the ready ONLY add when PR is ready to merge/full CI is needed label Nov 26, 2025
@MatthewBonanni
fix circular import
b3fd814 
Signed-off-by: Matthew Bonanni <mbonanni@redhat.com>
@hmellor
Copy link
Copy Markdown
Member

hmellor commented Nov 26, 2025

It's worth noting that the TYPE_CHECKING guard isn't always a workaround for circular imports. It can save time at runtime by not importing heavy modules that are only used for type checking.

LucasWilkinson
LucasWilkinson approved these changes Nov 27, 2025
View reviewed changes
Copy link
Copy Markdown
Collaborator

@LucasWilkinson LucasWilkinson 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 doing this!

@github-project-automation github-project-automation bot moved this to In review in NVIDIA Nov 27, 2025
yewentao256
yewentao256 approved these changes Nov 27, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@yewentao256 yewentao256 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 work!

@yewentao256 yewentao256 merged commit fc1d8be into vllm-project:main Nov 27, 2025
67 checks passed
@github-project-automation github-project-automation bot moved this from In review to Done in NVIDIA Nov 27, 2025
@NickLucche
Copy link
Copy Markdown
Collaborator

NickLucche commented Nov 27, 2025 •
edited
Loading

It's worth noting that the TYPE_CHECKING guard isn't always a workaround for circular imports. It can save time at runtime by not importing heavy modules that are only used for type checking.

yeah I am not really sure it was worth changing 40 files for that

kitaekatt pushed a commit to kitaekatt/vllm that referenced this pull request Dec 1, 2025
@MatthewBonanni @kitaekatt
[Attention] Update attention imports (vllm-project#29540)
353e1e1 
Signed-off-by: Matthew Bonanni <mbonanni@redhat.com>
amd-hhashemi pushed a commit to amd-hhashemi/vllm that referenced this pull request Dec 2, 2025
@MatthewBonanni @amd-hhashemi
[Attention] Update attention imports (vllm-project#29540)
ae6dcad 
Signed-off-by: Matthew Bonanni <mbonanni@redhat.com>
Signed-off-by: Hashem Hashemi <hashem.hashemi@amd.com>
dsuhinin pushed a commit to dsuhinin/vllm that referenced this pull request Jan 21, 2026
@MatthewBonanni @dsuhinin
[Attention] Update attention imports (vllm-project#29540)
0ac6bdd 
Signed-off-by: Matthew Bonanni <mbonanni@redhat.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LucasWilkinson LucasWilkinson LucasWilkinson approved these changes

@yewentao256 yewentao256 yewentao256 approved these changes

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@zhuohan123 zhuohan123 Awaiting requested review from zhuohan123

@alexm-redhat alexm-redhat Awaiting requested review from alexm-redhat

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

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

kv-connector nvidia ready ONLY add when PR is ready to merge/full CI is needed rocm Related to AMD ROCm speculative-decoding tpu Related to Google TPUs v1

Projects

NVIDIA
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@MatthewBonanni @hmellor @NickLucche @LucasWilkinson @yewentao256