Upstream sync 9/N: merge 0a1c5034f5 MiniMax M3 (conflict) - #1102
Merged
mgehre-amd merged 2 commits intoAug 13, 2026
Merged
Conversation
Signed-off-by: youkaichao <youkaichao@gmail.com> Signed-off-by: Isotr0py <mozf@mail2.sysu.edu.cn> Signed-off-by: Bugen Zhao <i@bugenzhao.com> Signed-off-by: Jee Jee Li <pandaleefree@gmail.com> Signed-off-by: functionstackx <47992694+functionstackx@users.noreply.github.com> Signed-off-by: Yongye Zhu <zyy1102000@gmail.com> Signed-off-by: Jee Jee Li <jeejeelee@inferact.ai> Co-authored-by: OpenAI Codex <codex@openai.com> Co-authored-by: Isotr0py <mozf@mail2.sysu.edu.cn> Co-authored-by: Thien Tran <gau.nernst@yahoo.com.sg> Co-authored-by: Bugen Zhao <i@bugenzhao.com> Co-authored-by: Jee Jee Li <pandaleefree@gmail.com> Co-authored-by: Roger Wang <hey@rogerw.io> Co-authored-by: functionstackx <47992694+functionstackx@users.noreply.github.com> Co-authored-by: Yongye Zhu <zyy1102000@gmail.com> Co-authored-by: Jee Jee Li <jeejeelee@inferact.ai>
Conflict-only step of the upstream catch-up. 0a1c503 is "[Model] Add MiniMax M3 support (vllm-project#45381)": 108 files, +14746 lines, touching 12 files the fork has also modified, but only one of them conflicts. vllm/envs.py: both sides append new environment-variable declarations to the same block - the fork's ROCm MoE/GDN switches and upstream's VLLM_MXFP8_EMULATION_DEQUANT_AT_LOAD. Purely additive, keep both. Checked afterwards that all seven declarations in that block still have a matching runtime entry in the environment_variables dict, and that no op registration in either torch_bindings.cpp lost its declaration (the failure mode seen in the GGUF migration merge). Signed-off-by: Robert Esclapez Garcia <robert.garcia@amd.com>
5 tasks
roberteg16
marked this pull request as ready for review
August 13, 2026 14:42
roberteg16
requested review from
AndreasKaratzas and
dllehr-amd
as code owners
August 13, 2026 14:42
1 task
mgehre-amd
approved these changes
Aug 13, 2026
This was referenced Aug 13, 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
Ninth step of the batched upstream catch-up. Stacked on #1101; chain is #1097 → #1098 → #1100 → #1101 → this. Retarget to
gfx11as the ones below land.Conflict-only step: exactly one upstream commit.
0a1c5034f5"[Model] Add MiniMax M3 support (vllm-project#45381)"mainA big commit that touches 12 files the fork has also modified, but only one actually conflicts.
Conflict and resolution
vllm/envs.py— both sides append new environment-variable declarations to the same block: the fork's ROCm switches (VLLM_MOE_AWQ_GEMV_HIP,VLLM_MOE_GPTQ_EXLLAMA,VLLM_MOE_HYBRID_W4A16,VLLM_MOE_HIP,VLLM_GDN_HIP,VLLM_ROCM_USE_MOE_WNA16_CUDA_KERNEL) and upstream'sVLLM_MXFP8_EMULATION_DEQUANT_AT_LOAD. Purely additive — kept both.Post-merge checks
Following the two silent breakages found earlier in this series (#1097, #1100), the standing checks were run rather than trusting the clean auto-merge:
envs.pyblock still have a matching runtime entry in theenvironment_variablesdict.ops.impl(...)registration in bothtorch_bindings.cppfiles still resolves to a declared symbol — this commit touchescsrc/libtorch_stable/ops.h,csrc/ops.h,torch_bindings.cppandCMakeLists.txt, which is exactly the shape that broke in Upstream sync 5/N: merge 6635279d8a GGUF-to-plugin migration (conflict) #1097. Clean (the only hits werecuda_utils.hdeclarations and a code comment).Test plan