Upstream sync 81/N: merge 92643d68f5 (28 commits, conflict-free) - #1189
Open
roberteg16 wants to merge 35 commits into
Open
Upstream sync 81/N: merge 92643d68f5 (28 commits, conflict-free)#1189roberteg16 wants to merge 35 commits into
roberteg16 wants to merge 35 commits into
Conversation
…eal qlen/dtype (vllm-project#45227) Signed-off-by: Edwin Lim <[email protected]> Signed-off-by: Chaemin Lim <[email protected]> Signed-off-by: QinPR <[email protected]> Co-authored-by: Edwin Lim <[email protected]> Co-authored-by: limeward <[email protected]> Co-authored-by: QinPR <[email protected]> Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]>
…tion-level uniqueness (vllm-project#50420) Signed-off-by: Bugen Zhao <[email protected]>
Signed-off-by: khluu <[email protected]> Co-authored-by: OpenAI Codex <[email protected]>
…ject#50467) Signed-off-by: Matthew Wong <[email protected]> Co-authored-by: Andreas Karatzas <[email protected]>
…vllm-project#50450) Signed-off-by: Dino Music <[email protected]> Co-authored-by: Andreas Karatzas <[email protected]>
…ct MI325X (vllm-project#50006) Signed-off-by: vanshbhatia-amd <[email protected]>
Signed-off-by: Ryan Rock <[email protected]> Co-authored-by: Andreas Karatzas <[email protected]> Co-authored-by: depthfirst-app[bot] <184448029+depthfirst-app[bot]@users.noreply.github.com> Co-authored-by: root <[email protected]>
…50349) Signed-off-by: Ma Jian <[email protected]> Co-authored-by: Kunshang Ji <[email protected]>
…vllm-project#50434) Signed-off-by: Wu, Xiaochang <[email protected]> Co-authored-by: Kunshang Ji <[email protected]>
…m-project#50301) Signed-off-by: Change72 <[email protected]> Co-authored-by: Cursor Agent <[email protected]>
…6 (gfx950) (vllm-project#49309) Signed-off-by: Stefan Koncarevic <[email protected]> Co-authored-by: Andreas Karatzas <[email protected]>
…-project#48047) Signed-off-by: Jeff Ma <[email protected]> Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Yongye Zhu <[email protected]>
…s with a clear error (fixes vllm-project#50337) (vllm-project#50352) Signed-off-by: seewoo <[email protected]> Co-authored-by: Claude <[email protected]>
…0293) Signed-off-by: Taneem Ibrahim <[email protected]>
…ject#49686) Signed-off-by: Isotr0py <[email protected]>
…y (4 GPUs) (vllm-project#50373) Signed-off-by: zengxian <[email protected]>
Co-authored-by: Jiazhi Mi <[email protected]>
Signed-off-by: Fadi Arafeh <[email protected]> Signed-off-by: jiang1.li <[email protected]> Co-authored-by: jiang1.li <[email protected]> Co-authored-by: Claude <[email protected]>
Signed-off-by: Taneem Ibrahim <[email protected]> Signed-off-by: Isotr0py <[email protected]> Co-authored-by: OpenAI Codex <[email protected]> Co-authored-by: Isotr0py <[email protected]>
Signed-off-by: Thien Tran <[email protected]> Co-authored-by: Codex <[email protected]>
Signed-off-by: mayuyuace <[email protected]>
…ecific implementation (vllm-project#46981) Signed-off-by: Chaojun Zhang <[email protected]> Co-authored-by: Kunshang Ji <[email protected]>
…0x (vllm-project#50219) Signed-off-by: Rehan Khan <[email protected]> Co-authored-by: Li, Jiang <[email protected]>
Signed-off-by: Fadi Arafeh <[email protected]>
…t#50517) Signed-off-by: Andreas Karatzas <[email protected]>
Signed-off-by: Bill Nell <[email protected]> Signed-off-by: bnellnm <[email protected]> Co-authored-by: Harry Mellor <[email protected]>
Signed-off-by: NickLucche <[email protected]>
Signed-off-by: Jee Jee Li <[email protected]>
Conflict-free upstream batch: the 28 commits between 4f1da84 and 92643d6 (2026-07-31 01:41 UTC .. 2026-07-31 11:12 UTC). git merge reported no conflicts; nothing in this merge is a manual resolution. 164 files, +2123/-719. csrc/rocm/, CMakeLists.txt, vllm/platforms/rocm.py, _aiter_ops.py and the fla tree are all untouched, so no SKINNY=1. No new pre-commit hook. One file deleted, vllm/kernels/xpu_ops.py. The surviving "xpu_ops" hits in fa_utils.py, paged_attn.py, mamba_ssm.py and mixed_precision/xpu.py all import from vllm._xpu_ops, which is the compiled extension namespace and a different module; nothing references vllm.kernels.xpu_ops. deepseek_v32/common/fused_ops.py moves to common/ops/fused_allreduce_rms_norm.py as a 91% rename with no stale path reference left. 14 definitions are removed and four have no surviving definition under vllm/. Three - _get_group_hash, is_xpu_kernels_found, prepare_int8_moe_layer_for_cpu - have zero references tree-wide and are XPU/CPU code. The fourth looked bad and was worth the trace: FusedMoE, with 15 surviving references. It is not dangling. Upstream renames the factory, def FusedMoE(...) -> FusedMoE -> def FusedMoEFactory(...) -> MoERunner and updates both call sites together with their imports. FusedMoEFactory is at fused_moe/layer.py:99 and MoERunner at fused_moe/runner/moe_runner.py:221, and both are re-exported from fused_moe/__init__.py. All 15 remaining mentions of the old name are in comments and docstrings - there is no import, no assignment, no class, and no string literal "FusedMoE" anywhere in any file type, so no lookup can miss. That last check matters because a renamed symbol surviving only in prose is a new false-positive shape for this series: a reference count alone reads it as 15 live uses of a deleted definition. Fork instrumentation intact: create_attention_profiler_scope counts unchanged in the ROCm/Triton attention backends (8/3/3). py_compile passes over all 143 changed Python files; ruff check and ruff format pass on the same set. Signed-off-by: Robert Esclapez Garcia <[email protected]>
5 tasks
Author
VerificationBuild clean. Correctness runs in CI (
Decode is within ±1% except: Gemma-3-4B-IT_VLM_w4a16. If that is the Gemma-3 row it is the #1169 regression (batch 61) inherited through the stack, not introduced here; anything else needs a second build before being called a finding. The canary's TTFT baseline is stale (predates |
roberteg16
marked this pull request as ready for review
August 18, 2026 10:10
roberteg16
requested review from
AndreasKaratzas and
dllehr-amd
as code owners
August 18, 2026 10:10
eble-amd
approved these changes
Aug 20, 2026
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.
Context
Eighty-first step of the batched upstream catch-up. Stacked on #1188.
Conflict-free step.
92643d68f5"K3 DSpark AR fusion (vllm-project#50242)"mainConflict-free upstream batch: the 28 commits between 4f1da84 and
92643d6 (2026-07-31 01:41 UTC .. 2026-07-31 11:12 UTC). git merge reported
no conflicts; nothing in this merge is a manual resolution.
164 files, +2123/-719. csrc/rocm/, CMakeLists.txt, vllm/platforms/rocm.py,
_aiter_ops.py and the fla tree are all untouched, so no SKINNY=1. No new
pre-commit hook.
One file deleted, vllm/kernels/xpu_ops.py. The surviving "xpu_ops" hits in
fa_utils.py, paged_attn.py, mamba_ssm.py and mixed_precision/xpu.py all import
from vllm._xpu_ops, which is the compiled extension namespace and a different
module; nothing references vllm.kernels.xpu_ops. deepseek_v32/common/fused_ops.py
moves to common/ops/fused_allreduce_rms_norm.py as a 91% rename with no stale
path reference left.
14 definitions are removed and four have no surviving definition under vllm/.
Three - _get_group_hash, is_xpu_kernels_found, prepare_int8_moe_layer_for_cpu -
have zero references tree-wide and are XPU/CPU code.
The fourth looked bad and was worth the trace: FusedMoE, with 15 surviving
references. It is not dangling. Upstream renames the factory,
and updates both call sites together with their imports. FusedMoEFactory is at
fused_moe/layer.py:99 and MoERunner at fused_moe/runner/moe_runner.py:221, and
both are re-exported from fused_moe/init.py. All 15 remaining mentions of
the old name are in comments and docstrings - there is no import, no
assignment, no class, and no string literal "FusedMoE" anywhere in any file
type, so no lookup can miss.
That last check matters because a renamed symbol surviving only in prose is a
new false-positive shape for this series: a reference count alone reads it as
15 live uses of a deleted definition.
Fork instrumentation intact: create_attention_profiler_scope counts unchanged
in the ROCm/Triton attention backends (8/3/3).
py_compile passes over all 143 changed Python files; ruff check and ruff format
pass on the same set.
Merge commit only — do not squash or rebase.
AI assistance was used to prepare this merge.
Test plan
VLLM_ROCM_USE_AITER_MOE_SITUV2_A8W4confirmed declared inenvs.py— import-time AttributeError otherwiseFusedMoEtraced: renamed toFusedMoEFactory/MoERunner, all 15 survivors are comments and docstrings, no import/assignment/string literalDummyFusedMoE/DummyCapturertraced to their own test filespy_compileover all 52 changed Python files;ruff checkandruff formatcleanAI assistance was used to prepare this merge.