Repository navigation
Merge upstream→gfx11 - #1373
Merged
Merged
Merge upstream→gfx11#1373
Conversation
…ect#56181) Signed-off-by: Giancarlo Delfin <gdelfin@inferact.ai>
…in indexer gather kernel (vllm-project#56153) Signed-off-by: xawang <xawang@amd.com>
…56405) Signed-off-by: Alec Flowers <aflowers@nvidia.com> Co-authored-by: Codex <noreply@openai.com>
…56485) Signed-off-by: wzhao18 <wzhao18.sz@gmail.com>
…oject#56503) Signed-off-by: Fangzhou Ai <fangzhou@semianalysis.ai> Co-authored-by: Fangzhou Ai <fangzhou@semianalysis.ai>
…g from (vllm-project#54689) Signed-off-by: Yizheng Jiao <jyizheng@gmail.com>
… it (vllm-project#56329) Signed-off-by: Tahsin Tunan <tahsintunan@gmail.com>
…ssert in fused KDA/MLA prefill (vllm-project#56526) Signed-off-by: Divakar Verma <divakar.verma@amd.com>
…roject#56463) Signed-off-by: zhenwei-intel <zhenwei.liu@intel.com>
…res (vllm-project#55047) Signed-off-by: Biswa Panda <biswa.panda@gmail.com> Signed-off-by: Bugen Zhao <i@bugenzhao.com> Co-authored-by: Bugen Zhao <i@bugenzhao.com> Co-authored-by: Codex <noreply@openai.com>
Signed-off-by: zjy0516 <riverclouds.zhu@qq.com> Co-authored-by: Codex <codex@openai.com>
…vllm-project#56386) Signed-off-by: Bugen Zhao <i@bugenzhao.com> Co-authored-by: Codex <noreply@openai.com>
…oject#53566) Signed-off-by: LopezCastroRoberto <rocastro@redhat.com> Co-authored-by: Codex <codex@openai.com>
…roject#53781) Signed-off-by: Matthew Bonanni <mbonanni@redhat.com> Signed-off-by: Lucas Wilkinson <lwilkins@redhat.com> Signed-off-by: Lucas Wilkinson <lwilkinson@neuralmagic.com> Signed-off-by: Matthew Bonanni <matthew@neuralmagic.com> Signed-off-by: Nicolò Lucchesi <nicolo.lucchesi@mistral.ai> Co-authored-by: OpenAI Codex <codex@openai.com> Co-authored-by: Lucas Wilkinson <lwilkins@redhat.com> Co-authored-by: Lucas Wilkinson <lwilkinson@neuralmagic.com> Co-authored-by: Nicolò Lucchesi <nicolo.lucchesi@mistral.ai> Co-authored-by: OpenAI Codex <noreply@openai.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com>
…-project#56378) Signed-off-by: Bugen Zhao <i@bugenzhao.com>
…els (vllm-project#54416) Signed-off-by: Canlin <canlinguosdu@gmail.com> Co-authored-by: Codex <noreply@openai.com>
…Connector demo (vllm-project#55088) Signed-off-by: junuxyz <216036880+junuxyz@users.noreply.github.com>
…roject#56554) Signed-off-by: Isotr0py <Isotr0py@outlook.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com> Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com> Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: walterbm <walter.beller.morales@gmail.com> Co-authored-by: Flora Feng <4florafeng@gmail.com>
…-project#56541) Signed-off-by: khluu <khluu000@gmail.com> Co-authored-by: Codex <noreply@openai.com>
…4007) Signed-off-by: arcusbuilds <srijankeshri007@gmail.com> Co-authored-by: Shengqi Chen <harry-chen@outlook.com>
Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com> Co-authored-by: OpenAI Codex <codex@openai.com>
…ect#55171) Signed-off-by: Kunshang Ji <jikunshang95@gmail.com>
…llm-project#56398) Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
…ject#56401) Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
vllm-project#55522) Signed-off-by: JartX <sagformas@epdcenter.es>
Signed-off-by: zhenwei-intel <zhenwei.liu@intel.com>
Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com> Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com> Signed-off-by: khluu <khluu000@gmail.com> Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: wang.yuqi <yuqi.wang@daocloud.io>
… (DBO) (vllm-project#51700) Signed-off-by: specture724 <specture724@gmail.com> Co-authored-by: Codex <noreply@openai.com>
…lm-project#56211) Signed-off-by: lxy-alexander <lxy_alexander@outlook.com> Co-authored-by: OpenAI Codex <noreply@openai.com>
…#56741) Signed-off-by: Bugen Zhao <i@bugenzhao.com>
…6669) Signed-off-by: Isotr0py <Isotr0py@outlook.com>
…llm-project#53353) Signed-off-by: hungh <hungh@nvidia.com>
…oject#56406) Co-authored-by: OpenAI Codex <noreply@openai.com> Signed-off-by: Alec Flowers <aflowers@nvidia.com>
…#48498) Signed-off-by: BWAAEEEK <jooho414@gmail.com> Co-authored-by: Andreas Karatzas <akaratza@amd.com> Co-authored-by: Cyrus Leung <tlleungac@connect.ust.hk>
Signed-off-by: wang.yuqi <yuqi.wang@daocloud.io>
…faster than the Triton chunk path) (vllm-project#55737) Signed-off-by: Jared Wen <jaredwen@inferact.ai> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…d_shapes is on (vllm-project#56016) Signed-off-by: Chinmay Kulkarni <Chinmay.Kulkarni@amd.com> Co-authored-by: Li, Jiang <jiang1.li@intel.com>
…end (vllm-project#56773) Signed-off-by: jiang1.li <jiang1.li@intel.com>
…56, 0, 256) layout + skip the NoPE K concat (vllm-project#55738) Signed-off-by: Jared Wen <jaredwen@inferact.ai> Signed-off-by: Jared Wen <w13431838023@gmail.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Resolved a conflict in the DFlash speculator by keeping the local logic that avoids rebuilding the attention metadata in the full-replay case, and applying the upstream change to the else branch. Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Resolve an insert-insert conflict in tests/test_config.py by keeping both. Signed-off-by: Dan Eble <Dan.Eble@amd.com>
One simple conflict was resolved: in vllm/v1/attention/backends/flash_attn.py, upstream changed a block that is indented in gfx11. Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Resolved a conflict in vllm/profiler/wrapper.py by taking the upstream change and manually reapplying gfx11's change to set max_name_column_width=100. Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Author
|
Important: This merge defined a new CI job that is enabled in forks, and it is failing for this PR. I've sought advice from upstream maintainers: vllm-project#56365 (comment)
Therefore, I propose merging this with the new job still enabled, in spite of the failure, and waiting a little while for advice from the upstream maintainers before finally deciding how to handle it in this branch. |
3 of 5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
Merge 238cb2b from upstream to gfx11 in stages dictated by conflicts.
Resolved a conflict in
vllm/profiler/wrapper.pyby taking the upstream change and manually reapplying gfx11's change to setmax_name_column_width=100.In
vllm/v1/attention/backends/flash_attn.py, upstream changed a block that is indented in gfx11.Resolve an insert-insert conflict in
tests/test_config.pyby keeping both.Resolved a conflict in the DFlash speculator by keeping the local logic that avoids rebuilding the attention metadata in the full-replay case, and applying the upstream change to the else branch.
Test Plan & Result (agentic)
Base 4685ba1 (gfx11); PR 8f3d9cb (upstream through 238cb2b). Radeon 8060S (gfx1151), ROCm 10.2.0a20261014, torch 2.13.0, Triton 3.8.0.
Cases were chosen where the merged changes touch the decode path on gfx1151: speculative decoding in Model Runner V2 and the Triton top-k/top-p sampler. All cases use greedy decoding at batch size 1.
Qwen3.6-35B-A3B-W4A16 MTP, MMStar
Mean of 4 runs per side, alternating base and PR.
Mean TPOT of a single run was either 10.07-10.10 ms or 10.28-10.29 ms on both sides.
Gemma-4-31B-IT AWQ-4bit MTP, MMStar
Mean of 4 runs per side, alternating base and PR.
apply_top_k_top_p_tritonWall time per call at batch size 1. GPU time is unchanged for every case with top-k; top-p alone is limited by kernel launch overhead.
Summary
No regression was found in the tested cases. Top-p-only sampling costs up to 19 µs more per call at batch size 1, which is 0.2% of a 10 ms decode step.
Not tested: Qwen3.6 DFlare (V1 model runner), which fails on both base and PR because of a known module-level
aiterimport inrocm_aiter_fa.py(fixed upstream in vllm-project#54805).Essential Elements of an Effective PR Description Checklist
supported_models.mdandexamplesfor a new model.