mirror of
https://github.com/ggml-org/llama.cpp.git
synced 2026-07-31 07:00:47 -05:00
* Add preliminary MiniMax-M3 support Text-only port that re-uses existing components: MiniMax-M2 style GQA with per-head QK-norm and partial rotary, DeepSeek-V3 style leading-dense and routed/shared experts, and swigluoai activation. Sparse attention is not yet supported (dense fallback); vision tower and MTP heads are dropped. * MiniMax-M3 vision tower (mmproj + clip graph) * Delete m3_vision_ref.py * Update clip.cpp * MSA * Update constants.py * Update minimax.py * Cache creation. Working withotu flash attention * Added flash attention for sparse layers * Decomposed slow cpu OP into GPU + CPU ops. Massive speedup over long ctx * Rewrote indexer op to be cuda native. Modified flash attention to match per group block picking * Implement sparse attention calc out of stock ops. * Fix a cache allocation and cont issue * Fixed -fa auto crash, flagged debug spots * Delete vocab.json * Delete model.safetensors.index.json * Delete generation_config.json * Delete Minimax directory * Handled multi stream case to fall back on Dense Attention * Development scaffolding cleanup. No functional change to the decode or 4-way paths. Full debug harness remains at <8136a9c68ed7a5eb009aa67bba3fda8062f4648f> for reproducing the selection-parity validation. * Remove redundant comment from minimax-m3.cpp * Changed 3 Gelu Ops for vision into Gelu_erf ops * Assert that n_kv is multiple of 128 * Rename MSA index tensors to indexer convention Note: All GGUFs generated before this change will need to be regenerated. * Fix incorrect Assert * Review driven changes (#3) * Remove comment from conversion minimax.py Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Remove whitespaces from constants.py Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Tighten comment in minimax.py Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * inherit MiniMax-M3 from MiniMax-M2 * drop dead text_config fallbacks * Add indexer writer methods * Reuse LLM_FFN_SWIGLU_OAI_MOE * Remove duplicate indexer setters, add only block_size/local_blocks, follow value naming convention * Fix conversion error /gguf_writer.py Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Update gguf-py/gguf/gguf_writer.py Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Update gguf-py/gguf/tensor_mapping.py Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Update conversion/minimax.py Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Update conversion/minimax.py Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Remove whitespace in src/llama-kv-cache.cpp Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Remove Whitespace in Update src/llama-model.h Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Remove whitespace in src/llama-hparams.h Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> * Update minimax_m3.cpp Rewrite code comment based on feedback and to better reflect the actual architecture, and reuse existing build_vit * Rename minimax_m3.cpp to minimax-m3.cpp * Update CMakeLists.txt * Remove debug code from clip.cpp * Update clip.cpp * Update comments in tools/mtmd/models/minimax-m3.cpp * Permute Q/K at conversion, drop precomputed sin/cos * Log cache size on launch, block ctx shift, support prompt caching Log indexer cache size on launch Disallow ctx shift Support prompt caching * Update minimax-m3.cpp * Optimize implementation, add multi stream support. Fully rewrote minimax-m3.cpp for speed and buffer size gains: Unified the 4-way + decode, 1 FA call per layer instead of 4, with the groups mapped onto ne[3] Custom CPU op now emits block-level mask, expanded on GPU, which causes CPU to GPU transfer to shrinks at prefill Decode: ~25 nodes/layer vs ~50, no per-group concats/conts Unified selection semantics, so both regimes rank bs + local bias (position-anchored local force), which means prefill/decode can no longer disagree on selection can_reuse on the MSA bias input. Graph reuse at decode restored (was rebuilding the full graph every token) In-place mask adds, shrinking compute buffer ~6.8 to ~4.2 GiB at ub2048/62k Multi-stream: MSA now runs with -np N when kv_unified=false. Decode stays batched across streams (still 1 FA call), prefill loops per stream. dense fallback only for --kv-unified + multi-seq Measured effect on expert offload bound setup: decode 6.2(4WAY)–7.15(MSA_decode) -> 7.7~7.8 t/s, flat from 5k to 60k+. prefill around 10% faster. buffer about 20% smaller, multi-user support. * set default cache type to F32 * Fix potential DSA double indexer cache allocation bug, only allocate in-cache k_idx for archs that opt in * remove F16 downcasts in MSA attention, force F32 indexer score accum * Add Minimax eos to llama vocab * Guard edge case where idx cache can become stale after a tail trim * Update llama-kv-cache.h * Update llama-kv-cache.cpp * Update llama-kv-cache.cpp * Update llama-kv-cache.h * Change resize Pad to none, resize alg to Bicubic Pillow * Review driven changes * Update llama-kv-cache.cpp * rm unrotated pos_t * fused rope w + pad * rename merge --> merger for consistency * add review skill for mtmd * graph should use hparams n_merge * fix lint --------- Co-authored-by: Daniel Han <danielhanchen@gmail.com> Co-authored-by: Sigbjørn Skjæret <1629204+CISC@users.noreply.github.com> Co-authored-by: Xuan Son Nguyen <son@huggingface.co>
170 lines
6.9 KiB
Python
170 lines
6.9 KiB
Python
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
import torch
|
|
|
|
if TYPE_CHECKING:
|
|
from torch import Tensor
|
|
|
|
from .base import ModelBase, TextModel, MmprojModel, gguf
|
|
|
|
|
|
@ModelBase.register("MiniMaxM2ForCausalLM")
|
|
class MiniMaxM2Model(TextModel):
|
|
model_arch = gguf.MODEL_ARCH.MINIMAXM2
|
|
_experts_cache: dict[int, dict[str, Tensor]] = {}
|
|
|
|
def set_gguf_parameters(self):
|
|
super().set_gguf_parameters()
|
|
|
|
self.gguf_writer.add_expert_feed_forward_length(self.find_hparam(["intermediate_size"]))
|
|
self.gguf_writer.add_rope_dimension_count(self.find_hparam(["rotary_dim"]))
|
|
|
|
def modify_tensors(self, data_torch: Tensor, name: str, bid: int | None):
|
|
# merge expert weights
|
|
if "block_sparse_moe.experts." in name:
|
|
n_experts = self.find_hparam(["num_local_experts", "num_experts"])
|
|
assert bid is not None
|
|
|
|
expert_cache = self._experts_cache.setdefault(bid, {})
|
|
expert_cache[name] = data_torch
|
|
expert_weights = ["w1", "w2", "w3"]
|
|
|
|
# not enough expert weights to merge
|
|
if len(expert_cache) < n_experts * len(expert_weights):
|
|
return
|
|
|
|
for w_name in expert_weights:
|
|
datas: list[Tensor] = []
|
|
|
|
for xid in range(n_experts):
|
|
ename = f"model.layers.{bid}.block_sparse_moe.experts.{xid}.{w_name}.weight"
|
|
datas.append(expert_cache[ename])
|
|
del expert_cache[ename]
|
|
|
|
data_torch = torch.stack(datas, dim=0)
|
|
merged_name = f"model.layers.{bid}.block_sparse_moe.experts.{w_name}.weight"
|
|
new_name = self.map_tensor_name(merged_name)
|
|
yield from super().modify_tensors(data_torch, new_name, bid)
|
|
|
|
del self._experts_cache[bid]
|
|
return
|
|
|
|
yield from super().modify_tensors(data_torch, name, bid)
|
|
|
|
|
|
@ModelBase.register("MiniMaxM3SparseForCausalLM", "MiniMaxM3SparseForConditionalGeneration")
|
|
class MiniMaxM3Model(MiniMaxM2Model):
|
|
model_arch = gguf.MODEL_ARCH.MINIMAXM3
|
|
|
|
def tensor_force_quant(self, name, new_name, bid, n_dims):
|
|
if ".indexer." in new_name:
|
|
return gguf.GGMLQuantizationType.F32
|
|
return super().tensor_force_quant(name, new_name, bid, n_dims)
|
|
|
|
def set_gguf_parameters(self):
|
|
super().set_gguf_parameters()
|
|
|
|
self.gguf_writer.add_expert_shared_count(self.find_hparam(["n_shared_experts"]))
|
|
self.gguf_writer.add_expert_weights_scale(self.find_hparam(["routed_scaling_factor"]))
|
|
self.gguf_writer.add_expert_weights_norm(True)
|
|
|
|
sac = self.find_hparam(["sparse_attention_config"])
|
|
self.gguf_writer.add_indexer_head_count(sac["sparse_num_index_heads"])
|
|
self.gguf_writer.add_indexer_key_length(sac["sparse_index_dim"])
|
|
self.gguf_writer.add_indexer_top_k(sac["sparse_topk_blocks"])
|
|
self.gguf_writer.add_indexer_block_size(sac["sparse_block_size"])
|
|
self.gguf_writer.add_indexer_local_blocks(sac["sparse_local_block"])
|
|
|
|
moe_layer_freq = self.find_hparam(["moe_layer_freq"])
|
|
n_dense = 0
|
|
for v in moe_layer_freq:
|
|
if v == 0:
|
|
n_dense += 1
|
|
else:
|
|
break
|
|
self.gguf_writer.add_leading_dense_block_count(n_dense)
|
|
|
|
def modify_tensors(self, data_torch: Tensor, name: str, bid: int | None):
|
|
# Gemma-style (1 + w) RMSNorm: bake the +1 in so llama.cpp can use plain RMSNorm
|
|
if name.endswith("norm.weight"):
|
|
data_torch = data_torch + 1.0
|
|
|
|
yield from super().modify_tensors(data_torch, name, bid)
|
|
|
|
|
|
@ModelBase.register("MiniMaxM3SparseForConditionalGeneration", "MiniMaxM3VLForConditionalGeneration")
|
|
class MiniMaxM3VisionModel(MmprojModel):
|
|
@classmethod
|
|
def filter_tensors(cls, item):
|
|
name, gen = item
|
|
# keep only the vision-side tensors; text / mtp / sparse-index are dropped
|
|
if not name.startswith(("vision_tower.", "multi_modal_projector.", "patch_merge_mlp.")):
|
|
return None
|
|
return super().filter_tensors((name, gen))
|
|
|
|
def set_gguf_parameters(self):
|
|
super().set_gguf_parameters()
|
|
assert self.hparams_vision is not None
|
|
|
|
self.gguf_writer.add_clip_projector_type(gguf.VisionProjectorType.MINIMAXM3)
|
|
self.gguf_writer.add_vision_use_gelu(True)
|
|
|
|
# the ViT carries its own LayerNorm eps (text tower uses a different one)
|
|
self.gguf_writer.add_vision_attention_layernorm_eps(
|
|
self.hparams_vision.get("layer_norm_eps", 1e-5)
|
|
)
|
|
|
|
comp = self.hparams_vision.get("img_token_compression_config", {})
|
|
merge_size = comp.get("spatial_merge_size", 2)
|
|
self.gguf_writer.add_vision_spatial_merge_size(int(merge_size))
|
|
|
|
def modify_tensors(self, data_torch, name, bid):
|
|
assert self.hparams_vision is not None
|
|
|
|
# Conv3d patch embed -> Conv2d slices
|
|
if name == "vision_tower.vision_model.embeddings.patch_embedding.weight":
|
|
if data_torch.ndim != 5:
|
|
raise ValueError(f"unexpected patch_embedding rank {data_torch.ndim} for {name}")
|
|
kt = data_torch.shape[2]
|
|
base = gguf.TENSOR_NAMES[gguf.MODEL_TENSOR.V_ENC_EMBD_PATCH]
|
|
for t in range(kt):
|
|
suffix = ".weight" if t == 0 else f".weight.{t}"
|
|
yield (base + suffix, data_torch[:, :, t, ...])
|
|
return
|
|
|
|
# Permute ViT q/k. HF [Ta Ha Wa | Tb Hb Wb | pad] reorder to [Ta Tb | Ha Hb | Wa Wb | pad].
|
|
for new_name, tensor in super().modify_tensors(data_torch, name, bid):
|
|
if ".attn_q." in new_name or ".attn_k." in new_name:
|
|
tensor = self._permute_vit_qk(tensor, new_name)
|
|
yield new_name, tensor
|
|
|
|
def _permute_vit_qk(self, t: "Tensor", new_name: str) -> "Tensor":
|
|
assert self.hparams_vision is not None
|
|
n_head = self.hparams_vision["num_attention_heads"]
|
|
d_head = t.shape[0] // n_head
|
|
axis_dim = 2 * ((2 * (d_head // 2) // 3) // 2)
|
|
ah = axis_dim // 2
|
|
half = 3 * ah
|
|
perm = []
|
|
perm += list(range(0, ah))
|
|
perm += list(range(half, half + ah))
|
|
perm += list(range(ah, 2 * ah))
|
|
perm += list(range(half + ah, half + 2 * ah))
|
|
perm += list(range(2 * ah, 3 * ah))
|
|
perm += list(range(half + 2 * ah, half + 3 * ah))
|
|
perm += list(range(2 * half, d_head))
|
|
|
|
assert axis_dim % 2 == 0
|
|
assert 3 * axis_dim <= d_head
|
|
assert len(perm) == d_head
|
|
assert sorted(perm) == list(range(d_head)), "perm is not a bijection of d_head"
|
|
assert t.shape[0] == n_head * d_head, f"{new_name}: {t.shape[0]} != {n_head}*{d_head}"
|
|
assert d_head == 80
|
|
|
|
idx = torch.tensor(perm, dtype=torch.long)
|
|
if t.ndim == 2:
|
|
return t.reshape(n_head, d_head, t.shape[1])[:, idx, :].reshape(t.shape)
|
|
return t.reshape(n_head, d_head)[:, idx].reshape(t.shape)
|