Skip to content

Bring this branch up to current main (DSA path moved out of nvidia/) - #1

Merged
foraxe merged 1086 commits into
foraxe:agent/glm52-dcp-correctness-upstreamfrom
drakosha:rebase-50005-on-main
Aug 23, 2026
Merged

Bring this branch up to current main (DSA path moved out of nvidia/)#1
foraxe merged 1086 commits into
foraxe:agent/glm52-dcp-correctness-upstreamfrom
drakosha:rebase-50005-on-main

Conversation

@drakosha

@drakosha drakosha commented Aug 22, 2026

Copy link
Copy Markdown

Brings this branch up to current main (da329cc30) so it merges cleanly again.

Your two commits stopped applying because the fused DSA path moved in August: vllm/models/deepseek_v32/nvidia/attention.py is now deepseek_v32/attention.py, and nvidia/kernels.py is now common/kernels.py. Nothing else about the fix changed. Your regression test came along and now lives next to the existing cases in tests/kernels/test_fused_deepseek_v32_norm_rope.py.

It is a merge commit, so it applies to your branch without conflicts. After merging, vllm-project#50005 loses needs-rebase and shows three files, 110 lines against main. The diff GitHub displays here is large only because the branch is catching up with a month of main.

Verified on 4xH200 with GLM-5.2-NVFP4, TP4 + DCP4, fp8_ds_mla:

  • DCP=4 output is byte-identical to DCP=1 under greedy decoding. Unpatched main emits repeated-token garbage (locklocklock...) on the same prompt.
  • pytest tests/kernels/test_fused_deepseek_v32_norm_rope.py: 67 passed with the fix. Without it, your new case is the only failure (1 failed, 66 passed), so it does catch the bug it describes.

Authorship on the commit is yours; I signed off as the submitter. AI assistance was used for the rebase and the test runs.

HollowMan6 and others added 30 commits August 17, 2026 17:40
…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>
Signed-off-by: Divakar Verma <divakar.verma@amd.com>
…llm-project#52174)

Signed-off-by: Jakub Byczkowski <jakub.byczkowski@intel.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…llm-project#51395)

Signed-off-by: tommy-asai-sonarsource <yosuke.asai@sonarsource.com>
Co-authored-by: Roger Wang <hey@rogerw.io>
Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>
Signed-off-by: Summer Yang <girasoleyang@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Yifan Qiao <yifanqiao@inferact.ai>
…1924)

Signed-off-by: Bo Li <22713281+bobboli@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…t#52539)

Signed-off-by: kiroxu <148877251+BabyDrangoner@users.noreply.github.com>
…availability (vllm-project#52648)

Signed-off-by: Han Li <han.li124@imperial.ac.uk>
Signed-off-by: Misha Goin <mgoin64@gmail.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Misha Goin <mgoin64@gmail.com>
Signed-off-by: mayuyuace <qiming1.zhang@intel.com>
Signed-off-by: Qiming Zhang <qiming1.zhang@intel.com>
Co-authored-by: Kunshang Ji <kunshang.ji@intel.com>
…ect#51426)

Co-authored-by: Bugen Zhao <i@bugenzhao.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
Signed-off-by: Woosuk Kwon <woosuk@inferact.ai>
…ms (vllm-project#52044)

Co-authored-by: Do_it_now_! <23432123@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Yan Ma <yan.ma@intel.com>
Co-authored-by: Kunshang Ji <kunshang.ji@intel.com>
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
Co-authored-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
Signed-off-by: flb_ <floatlibai@gmail.com>
AndreasKaratzas and others added 24 commits August 21, 2026 13:15
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
…d attention (vllm-project#53177)

Signed-off-by: Divakar Verma <divakar.verma@amd.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Signed-off-by: Divakar Verma <divakar.verma@amd.com>
Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
Signed-off-by: Andreas Karatzas <akaratza@amd.com>
Co-authored-by: Itay Etelis <92247226+Etelis@users.noreply.github.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: Lucas Wilkinson <lwilkins@redhat.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…ject#53294)

Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
…t#53296)

Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
…rpreter (vllm-project#53117)

Signed-off-by: Stefan Koncarevic <Stefan.Koncarevic@amd.com>
Signed-off-by: Andrew Berneshawi <andrewberneshawi@cohere.com>
Signed-off-by: Maroon Ayoub <mayoub@redhat.com>
Signed-off-by: Stefan Koncarevic <Stefan.Koncarevic@amd.com>
…-experts KV group (vllm-project#53240)

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

Signed-off-by: Yongye Zhu <zyy1102000@gmail.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…t of the shared runner (vllm-project#53176)

Signed-off-by: Tianyu Guo <guoty@inferact.ai>
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
)

Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…53213)

Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…project#50272)

Signed-off-by: jens.luecke <jens.luecke@liquid.ai>
Co-authored-by: Tonoken3 <sakamakismile@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
The fused DSA path moved out of vllm/models/deepseek_v32/nvidia/ into
attention.py and common/kernels.py, which is what left this branch
conflicting. Conflicts resolved in favour of the new layout with the fix
carried over unchanged; the regression test merged cleanly.

Signed-off-by: Mikhail Kostryukov <mike@triptrack.net>
@drakosha
drakosha force-pushed the rebase-50005-on-main branch from 2f0fce2 to e0446ec Compare August 22, 2026 17:03
@drakosha drakosha changed the title Rebase onto current main (DSA path moved out of nvidia/) Bring this branch up to current main (DSA path moved out of nvidia/) Aug 22, 2026
@foraxe
foraxe merged commit ffeea6f into foraxe:agent/glm52-dcp-correctness-upstream Aug 23, 2026
@foraxe

foraxe commented Aug 23, 2026

Copy link
Copy Markdown
Owner

Thanks @drakosha - reviewed and merged. I confirmed that upstream vllm-project#50005 is now mergeable and shows only the three intended files. I also reran the focused suite on GB200 (67 passed) and all applicable changed-file pre-commit hooks passed. The upstream PR and issue descriptions now use the current two-defect scope and credit your H200 validation.

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.