Skip to content

Upstream sync 23/N: merge 5ae2d38821 (76 commits, conflict-free) - #1270

Merged
roberteg16 merged 79 commits into
rogarcia.merge-upstream-118from
rogarcia.merge-upstream-119
Sep 10, 2026
Merged

roberteg16 merged 79 commits into
rogarcia.merge-upstream-118from
rogarcia.merge-upstream-119

Conversation

@roberteg16

@roberteg16 roberteg16 commented Sep 7, 2026

Copy link
Copy Markdown

Summary

Conflict-free upstream batch: the 76 commits between 81e81dac1f and 5ae2d38821 (2026-08-14 22:11 UTC .. 2026-08-17 23:30 UTC). Second half of the 151-commit clean run split at batch 22.

337 files, +14679/−5463.

Findings

Deleted files. Six across the pair, all verified as renames/consolidations rather than removals:

  • tests/kernels/quantization/test_block_int8.py — removed by 7d7b6f26f4 ("[Refactor] Remove dead code for quantization", [Refactor] Remove dead code for quantization vllm-project/vllm#52221). The one CI reference that greps as a match, .buildkite/test_areas/kernels.yaml:390, points at kernels/moe/test_block_int8.py — a different, surviving file. Checked explicitly rather than assumed, since the basenames are identical.
  • vllm/model_executor/warmup/v1_block_table_warmup.py — removed by 49905ad94d (new JIT warmup infrastructure, [3/N][Feat][Perf] Add new warmup infrastructure for JITs. Add provider registry and orchestration for JIT warmup vllm-project/vllm#50174); the module is fully de-registered and the warmup package now exposes the *_warmup.py provider set instead.
  • .../scaled_mm/b12x_block.py, .../scaled_mm/b12x_tensor.py and their two tests — consolidated into a single .../scaled_mm/b12x.py. Confirmed the symbols still resolve: B12xTensorFP8ScaledMMLinearKernel is at b12x.py:199, no import anywhere references the deleted module paths, and the two deleted tests are superseded by tests/model_executor/kernels/test_b12x_linear.py.

The next commit, 49fb2ee348 ([ROCm][CI] add Aiter ops tests, vllm-project#52208), conflicts in vllm/_aiter_ops.py and gets its own PR.

Merge commit only — do not squash or rebase.

AI assistance was used to prepare this merge.

Test plan

  • pre-commit run --all-files green on the merged tree
  • All six deletions confirmed renames/consolidations; surviving symbols located by line, no dangling module paths
  • Build + 6-model benchmark sweep vs the Strix Halo dashboard — no regression on transformers 5.15.0, all six within the gate (results)

khluu and others added 30 commits August 14, 2026 15:12
Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com>
Signed-off-by: Nick Hill <nickhill123@gmail.com>
…aft tokens (vllm-project#49793)

Signed-off-by: Peiyuan Zhou <peiyuanzhou1994@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…9515)

Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
…ine (vllm-project#45802)

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…p8_fp4_mega_moe (vllm-project#52445)

Signed-off-by: UranusSeven <109661872+UranusSeven@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com>
…lm-project#49585)

Signed-off-by: yewentao256 <zhyanwentao@126.com>
Signed-off-by: omerpaz95 <omerpaz95@gmail.com>
Signed-off-by: omerpaz95 <73347585+omerpaz95@users.noreply.github.com>
Co-authored-by: yewentao256 <zhyanwentao@126.com>
Co-authored-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com>
…1318)

Signed-off-by: tobymao <toby.mao@gmail.com>
Signed-off-by: Yongye Zhu <zyy1102000@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Roger Wang <hey@rogerw.io>
Co-authored-by: Yongye Zhu <zyy1102000@gmail.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
vllm-project#52394)

Signed-off-by: Jeffrey Wang <jeffreywang@anyscale.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…es (vllm-project#52246)

Signed-off-by: Do_it_now_! <lizhengcheng233@gmail.com>
…aft-prefix matching (vllm-project#52311)

Signed-off-by: jyan <r_02213@sjtu.edu.cn>
Co-authored-by: jyan <r_02213@sjtu.edu.cn>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…ject#52441)

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
…ask mapping when the draft budget is zero (vllm-project#52436)

Signed-off-by: oops-oom <73481342@qq.com>
Co-authored-by: oops-oom <73481342@qq.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
…l throughput (vllm-project#52084)

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
…text batches (vllm-project#52356)

Signed-off-by: Shantipriya Parida <shantipriya.parida@amd.com>
…ase (vllm-project#52514)

Signed-off-by: AlanFokCo <alanfok2868@gmail.com>
Signed-off-by: Dakai An <dakaian108@gmail.com>
Co-authored-by: AlanFokCo <alanfok2868@gmail.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…stants (vllm-project#51967)

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: yewentao256 <zhyanwentao@126.com>
…t#52050)

Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
Co-authored-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com>
mgoin and others added 19 commits August 17, 2026 12:48
…_type=qwen3` (vllm-project#52197)

Signed-off-by: mgoin <mgoin64@gmail.com>
…r registry and orchestration for JIT warmup (vllm-project#50174)

Signed-off-by: LopezCastroRoberto <rocastro@redhat.com>
Co-authored-by: Codex <codex@openai.com>
…ng (vllm-project#52552)

Signed-off-by: Hollow Man <hollowman@opensuse.org>
…adowing (vllm-project#52126)

Signed-off-by: jperezde <jperezde@redhat.com>
…f_comparison` (vllm-project#52608)

Signed-off-by: Stefan Koncarevic <Stefan.Koncarevic@amd.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
)

Signed-off-by: Lucas Wilkinson <wilkinson.lucas@gmail.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Robert Shaw <114415538+robertgshaw2-redhat@users.noreply.github.com>
…-project#52566)

Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: khluu <kevin@inferact.ai>
Signed-off-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: khluu <kevin@inferact.ai>
Co-authored-by: Nick Hill <nickhill123@gmail.com>
Signed-off-by: wzhao18 <wzhao18.sz@gmail.com>
Signed-off-by: Connor Carpenter <connorc@nvidia.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: Micah Williamson <micah.williamson@amd.com>
…runtime packages to docker image (vllm-project#51208)

Signed-off-by: Hongxia Yang <hongxia.yang@amd.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
Signed-off-by: gcanlin <canlinguosdu@gmail.com>
Signed-off-by: Canlin Guo <961750412@qq.com>
Signed-off-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: Nick Hill <nickhill123@gmail.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>
…roject#52573)

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Co-authored-by: Nick Hill <nickhill123@gmail.com>
@roberteg16
roberteg16 marked this pull request as ready for review September 8, 2026 10:12
@roberteg16
roberteg16 requested review from eble-amd and removed request for AndreasKaratzas and dllehr-amd September 8, 2026 10:12
@roberteg16
roberteg16 added this pull request to stack #1288 September 10, 2026 05:59
@roberteg16
roberteg16 merged commit 17fcf0f into gfx11 Sep 10, 2026
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.