Skip to content

Upstream sync 9/N: merge 0a1c5034f5 MiniMax M3 (conflict) - #1102

Merged
mgehre-amd merged 2 commits into
rogarcia.merge-upstream-08from
rogarcia.merge-upstream-09
Aug 13, 2026
Merged

mgehre-amd merged 2 commits into
rogarcia.merge-upstream-08from
rogarcia.merge-upstream-09

Conversation

@roberteg16

@roberteg16 roberteg16 commented Aug 13, 2026

Copy link
Copy Markdown

Context

Ninth step of the batched upstream catch-up. Stacked on #1101; chain is #1097#1098#1100#1101 → this. Retarget to gfx11 as the ones below land.

Conflict-only step: exactly one upstream commit.

Merged upstream commit 0a1c5034f5 "[Model] Add MiniMax M3 support (vllm-project#45381)"
Landed on upstream main 2026-06-15 17:01 UTC
Commits in this PR 1
Upstream size 108 files, +14746 / −323

A 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's VLLM_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:

  • All seven declarations in that envs.py block still have a matching runtime entry in the environment_variables dict.
  • Every ops.impl(...) registration in both torch_bindings.cpp files still resolves to a declared symbol — this commit touches csrc/libtorch_stable/ops.h, csrc/ops.h, torch_bindings.cpp and CMakeLists.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 were cuda_utils.h declarations and a code comment).

Test plan

youkaichao and others added 2 commits June 16, 2026 01:01
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>
@mgehre-amd
mgehre-amd merged commit 5c155d4 into rogarcia.merge-upstream-06 Aug 13, 2026
4 checks passed
@roberteg16
roberteg16 deleted the rogarcia.merge-upstream-09 branch August 28, 2026 18:30
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.

3 participants