Skip to content

Merge upstream→gfx11 - #1385

Merged
mgehre-amd merged 161 commits into
gfx11from
eble.merge-from-upstream
Oct 20, 2026
Merged

mgehre-amd merged 161 commits into
gfx11from
eble.merge-from-upstream

Conversation

@eble-amd

@eble-amd eble-amd commented Oct 19, 2026 •

Copy link
Copy Markdown

Purpose

Merge 955bd6a from upstream to gfx11 in stages dictated by conflicts. Notes on conflicts:

  1. from 7d99c2c
    Resolved insert-insert conflict in csrc/libtorch_stable/moe/moe_permute_unpermute_op.cu by keeping both sides.
  2. from 0b7f11a
    File conflicts were resolved automatically by meld.
  3. after e9f169d
    Inserted a newly minted commit to disable the pre-commit check named check-test-tethering because we are not testing the gfx11 branch with Buildkite, so it does not make sense to force ourselves to maintain related scripts.
  4. from a33b3ba
    Resolve insert-insert conflicts in qwen2_5_vl.py by keeping both sides. They involved build_qwen2_5_vision_transformer and Qwen2_5_VLDummyInputsBuilder.
  5. from 2af0551
    Resolved insert-insert conflicts in envs.py by keeping both sides.

Validation (agentic)

Radeon 8060S (gfx1151), ROCm 10.2.0a20261019, torch 2.13.0, Triton 3.8.0.
Base 38e70e9c008c, PR 68e21e98d19d. Serving benchmarks, one request at a time.

Case TTFT ms base TTFT ms PR TTFT Δ TPOT ms base TPOT ms PR TPOT Δ
Qwen3.6-35B-A3B-W4A16 VLM, MTP, MMStar 200.6 198.3 -1.1% 10.15 10.09 -0.6%
Qwen3.6-35B-A3B-W4A16 VLM, 4k prefix + 1k, prefix caching 451.9 451.2 -0.1% 12.24 12.19 -0.4%
Qwen3-30B-A3B-Instruct-2507-AWQ, EAGLE3, AIME 226.2 221.4 -2.1% 13.98 13.98 -0.1%
Gemma-4-E4B-IT-AWQ VLM, DFlare, RoboVQA 314.7 307.5 -2.3% 6.00 5.97 -0.5%
Gemma-4-31B-IT-AWQ VLM, ?, MTP, MMStar 1237.0 1223.1 -1.1% 36.07 36.06 -0.0%
Qwen3-VL-4B-Instruct-AWQ VLM 679.4 672.1 -1.1% 14.16 14.17 +0.1%

All cases pass on both builds with identical input and output token counts.
Speculative acceptance length is unchanged except Qwen3.6 MTP (1.846 base, 1.842 PR).
Differences are within run-to-run variation (about 2%).


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.

Isotr0py and others added 30 commits September 20, 2026 21:51
Signed-off-by: jinzhen.ljz <jinzhen.ljz@antgroup.com>
Signed-off-by: mgoin <mgoin64@gmail.com>
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: mgoin <mgoin64@gmail.com>
…53945 follow-up) (vllm-project#57382)

Signed-off-by: Roi Koren <roik@nvidia.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: yewentao256 <zhyanwentao@126.com>
…-project#57450)

Signed-off-by: Sheral Kumar <shekumar@amd.com>
Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Co-authored-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
…AD mode (vllm-project#51052)

Signed-off-by: Yichao Zhu <Yichao.Zhu@amd.com>
…curacy issue. (vllm-project#57779)

Signed-off-by: yisheng <yi.sheng@intel.com>
Co-authored-by: Kunshang Ji <kunshang.ji@intel.com>
…oject#57603)

Signed-off-by: Woosuk Kwon <woosuk@inferact.ai>
Co-authored-by: Codex <noreply@openai.com>
…hrough stale block-table rows (vllm-project#56734)

Signed-off-by: Yifan Qiao <yifanqiao@inferact.ai>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
)

Signed-off-by: jiangkuaixue123 <jiangxiaozhou111@163.com>
Co-authored-by: Codex <noreply@openai.com>
…lm-project#54581)

Signed-off-by: CrazyCoder <18235787078@163.com>
Signed-off-by: aoshen02 <aoshen@inferact.ai>
Co-authored-by: aoshen02 <aoshen@inferact.ai>
Co-authored-by: Codex <noreply@openai.com>
Signed-off-by: Zhou Zihang <z@mcac.cc>
Co-authored-by: Jee Jee Li <pandaleefree@gmail.com>
…ture (vllm-project#57811)

Signed-off-by: Jee Jee Li <jeejeelee@inferact.ai>
Signed-off-by: khluu <khluu000@gmail.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: Jee Jee Li <pandaleefree@gmail.com>
…oject#57643)

Signed-off-by: Woosuk Kwon <woosuk@inferact.ai>
Co-authored-by: Codex <noreply@openai.com>
Signed-off-by: Matt Mastracci <matthew@mastracci.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…llm-project#57783)

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
Signed-off-by: zjy0516 <riverclouds.zhu@qq.com>
Co-authored-by: zjy0516 <riverclouds.zhu@qq.com>
)

Signed-off-by: zhenwei-intel <zhenwei.liu@intel.com>
Co-authored-by: Kunshang Ji <kunshang.ji@intel.com>
…vllm-project#57864)

Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
Signed-off-by: zhenwei-intel <zhenwei.liu@intel.com>
Co-authored-by: Kunshang Ji <kunshang.ji@intel.com>
…oject#57868)

Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
vllm-project#53758)

Signed-off-by: Oliver Holworthy <1216955+oliverholworthy@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…list (vllm-project#48416)

Signed-off-by: john <6712432+CaiJohn@users.noreply.github.com>
Co-authored-by: john <6712432+CaiJohn@users.noreply.github.com>
Co-authored-by: Codex <noreply@openai.com>
vllm-project#57885)

Signed-off-by: Woosuk Kwon <woosuk@inferact.ai>
Co-authored-by: OpenAI Codex <noreply@openai.com>
…ct#57874)

Signed-off-by: Woosuk Kwon <woosuk@inferact.ai>
Co-authored-by: OpenAI Codex <noreply@openai.com>
…fault (vllm-project#57651)

Signed-off-by: Juntian Liu <Juntianl777@gmail.com>
Signed-off-by: zjy0516 <riverclouds.zhu@qq.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: zjy0516 <riverclouds.zhu@qq.com>
jeejeelee and others added 21 commits September 23, 2026 05:40
Signed-off-by: Jee Jee Li <jeejeelee@inferact.ai>
… streaming tool calls (vllm-project#46303)

Signed-off-by: Ting Sun <suntcrick@gmail.com>
)

Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…roject#57176)

Signed-off-by: aoshen02 <aoshen@inferact.ai>
Signed-off-by: S1ro1 <matej.sirovatka@gmail.com>
Signed-off-by: aoshen02 <aoshen02@users.noreply.github.com>
Co-authored-by: aoshen02 <aoshen@inferact.ai>
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: aoshen02 <aoshen02@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…lm-project#58282)

Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
…t#58281)

Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
…57174)

Signed-off-by: NickLucche <nicolo.lucchesi@mistral.ai>
Co-authored-by: Yifan Qiao <17067717+ivanium@users.noreply.github.com>
…pure functions (vllm-project#57732)

Signed-off-by: aoshen02 <aoshen@inferact.ai>
Co-authored-by: Yongye Zhu <zyy1102000@gmail.com>
…58099)

Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…oject#58169)

Signed-off-by: zjy0516 <riverclouds.zhu@qq.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
…project#58252)

Signed-off-by: kimi-no-na-wa <kimi-no-na-wa@users.noreply.github.com>
Co-authored-by: kimi-no-na-wa <kimi-no-na-wa@users.noreply.github.com>
Resolved insert-insert conflict in
csrc/libtorch_stable/moe/moe_permute_unpermute_op.cu by keeping both
sides.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
File conflicts were resolved automatically by meld.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Prevent this check from running in our branch because we are not testing
our branch with Buildkite.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Resolve insert-insert conflicts in `qwen2_5_vl.py` by keeping both
sides.  They involved `build_qwen2_5_vision_transformer` and
`Qwen2_5_VLDummyInputsBuilder`.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Resolved insert-insert conflicts in envs.py by keeping both sides.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
@mgehre-amd
mgehre-amd merged commit f9b34f8 into gfx11 Oct 20, 2026
13 of 14 checks passed
@eble-amd
eble-amd deleted the eble.merge-from-upstream branch October 20, 2026 13:44
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.