Skip to content

Upstream sync 8/N: merge 90fd4a333f (30 commits, conflict-free) - #1255

Merged
roberteg16 merged 33 commits into
rogarcia.merge-upstream-103from
rogarcia.merge-upstream-104
Sep 8, 2026
Merged

roberteg16 merged 33 commits into
rogarcia.merge-upstream-103from
rogarcia.merge-upstream-104

Conversation

@roberteg16

@roberteg16 roberteg16 commented Sep 7, 2026

Copy link
Copy Markdown

Summary

Conflict-free upstream batch: the 30 commits between 21c667aa64 and 90fd4a333f (2026-08-10 17:34 UTC .. 2026-08-11 04:33 UTC). git merge reported no conflicts; nothing in this merge is a manual resolution.

166 files, +9194/−1414.

Findings

Boundary probed in a ladder: k=25 clean; k=100, 150, 200, 300, 400, 500, 700 and the tip (k=751) all conflict. Stepping forward from 25, k=26..30 are clean and k=31 conflicts.

Deleted files. One, rust/src/chat/src/renderer/hf/value.rs, removed by upstream's d8c70f2243 ("[Rust Frontend] Upgrade MiniJinja to 2.22 & remove method lookup workaround", vllm-project#51235) — the workaround the file implemented is obsolete under MiniJinja 2.22. Verified the removal is complete rather than dangling: mod value; is gone from rust/src/chat/src/renderer/hf/mod.rs (which now declares only error, format, template, tojson), and the sole remaining value:: path in the crate is minijinja::value::{Kwargs, ViaDeserialize} in tojson.rs, which is MiniJinja's own module.

The next commit, dc5101fb1b (replace batch_norm to numerically identical without cudnn, vllm-project#51734), conflicts in vllm/model_executor/models/vision.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
  • Deleted Rust module confirmed de-registered from mod.rs; no stale paths
  • Build + 6-model benchmark sweep vs the Strix Halo dashboard — run 3512149, no regression (see comment)

WoosukKwon and others added 30 commits August 10, 2026 10:52
Signed-off-by: Woosuk Kwon <woosuk@inferact.ai>
Co-authored-by: OpenAI Codex <codex@openai.com>
…m-project#51507)

Signed-off-by: BabyDrangoner <148877251+BabyDrangoner@users.noreply.github.com>
Signed-off-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…l grammar terminates (vllm-project#49227)

Signed-off-by: sfeng33 <4florafeng@gmail.com>
…47030)

Signed-off-by: lcskrishna <lollachaitanya@gmail.com>
Co-authored-by: Sheral Kumar <shekumar@amd.com>
Co-authored-by: avininjamay8 <Avinash.Paul@amd.com>
Co-authored-by: tej <37236721+itej89@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: xijiade.aihemaiti <3146335281@qq.com>
Signed-off-by: xijiaat <52128022+xijiaat@users.noreply.github.com>
Co-authored-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: girasoley <girasoley@inferact.ai>
Signed-off-by: Summer Yang <girasoleyang@gmail.com>
Signed-off-by: 云挚 <ningyunxiao.nyx@antgroup.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: 云挚 <ningyunxiao.nyx@antgroup.com>
Co-authored-by: foraxe <73625538+foraxe@users.noreply.github.com>
Co-authored-by: Woosuk Kwon <woosuk@inferact.ai>
Signed-off-by: Connor Carpenter <connorc@nvidia.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: khluu <khluu000@gmail.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
…roject#51178)

Signed-off-by: Connor Carpenter <connorc@nvidia.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…llm-project#47352)

Signed-off-by: Giancarlo Delfin <gdelfin@inferact.ai>
Co-authored-by: Woosuk Kwon <woosuk@inferact.ai>
…guided decoding (vllm-project#51727)

Signed-off-by: sfeng33 <4florafeng@gmail.com>
Co-authored-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com>
Signed-off-by: samuelkim7 <samuelmwkim@gmail.com>
Signed-off-by: khluu <khluu000@gmail.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…around (vllm-project#51235)

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…th outputs (vllm-project#51461)

Signed-off-by: qyYue1389 <yueqiuyang1389@gmail.com>
…roject#51144)

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: Tarun Kumar <takumar@redhat.com>
Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
vllm-project#51478)

Signed-off-by: Allen Shen <aoshen@inferact.ai>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…llm-project#49519)

Signed-off-by: aoshen02 <aoshen@inferact.ai>
Co-authored-by: Roger Wang <hey@rogerw.io>
…oject#51721)

Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
…cal_layout is requested (vllm-project#51688)

Signed-off-by: Itay Etelis <itay.etelis@ibm.com>
Co-authored-by: Itay Etelis <itay.etelis@ibm.com>
…imi K3 DSpark TTFT (vllm-project#51725)

Signed-off-by: yewentao256 <zhyanwentao@126.com>
…refix caching is off (vllm-project#51482)

Signed-off-by: theminghuang <theminghuang@gmail.com>
Signed-off-by: Ming Huang <mhhua@google.com>
)

Signed-off-by: Clinton Thomas <1033162+KernelClint@users.noreply.github.com>
Co-authored-by: Lucas Bourtoule <35483370+dhalf@users.noreply.github.com>
@roberteg16

roberteg16 commented Sep 7, 2026

Copy link
Copy Markdown
Author

Benchmarks

Six-model sweep run on the Strix Halo board via Custom Regression run 3512149.

No regression — decode and TTFT both flat across the set.

bench model decode tok/s baseline Δ TTFT ms baseline Δ
bench1 Qwen3-30B-A3B-Instruct-2507-AWQ-4bit 80.2 80.2 +0.1% 187.3 187.0 +0.2%
bench2 Qwen3.6-35B-A3B-W4A16 (int8:g32 lm-head) 82.9 83.0 −0.1% 265.8 281.5 −5.6%
bench3 gemma-3-4b-it-quantized.w4a16 61.6 61.5 +0.2% 464.2 463.8 +0.1%
bench4 Qwen3-Omni-30B-A3B-Instruct-AWQ-4bit 75.5 75.9 −0.6% 688.3 702.1 −2.0%
bench5 Qwen2.5-0.5B-Instruct-AWQ 357.0 358.5 −0.4% 16.9 16.8 +0.2%
bench6 gemma-4-31B-it-AWQ-4bit 10.3 10.3 +0.1% 1536.0 1533.7 +0.2%

Largest decode move is −0.6%, inside the 1% gate. All six report PASS with sanity checks green and exit code 0.

Decode is derived from median_tpot_ms rather than the report's max_output_tokens_per_s, which is rounded to whole tok/s — at bench5's ~357 tok/s one integer step is already 0.3%, so that field cannot resolve a 1% gate.

Baselines are the nightly dashboard run of 2026-09-05 (20260905_180640, vLLM c84454ff4).

Scope. The run built 4f03b854e, GitHub's merge commit for #1259 (9686e281df into 0a7aeafd4d) — the top of batch 12, so it contains this PR and every batch below it, and excludes batch 13 (#1260). Individual batches were not swept separately; a regression introduced by one and offset by another would not be visible here, though nothing in the numbers suggests that.

Environment: host xconucstrhalo07, gfx1151, 96 GiB. ROCm 10.1.0a20260906, torch 2.13.0, triton 3.8.0+git4cff872c, transformers 5.14.1.

AI assistance was used to run this verification.

@roberteg16
roberteg16 marked this pull request as ready for review September 7, 2026 15:34
@roberteg16
roberteg16 requested review from mgehre-amd and removed request for AndreasKaratzas and dllehr-amd September 7, 2026 15:34
@roberteg16
roberteg16 merged commit c2dc356 into gfx11 Sep 8, 2026
11 of 12 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.