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> * remove multimodal code upon maintainer request. Will be made as a separate PR * Whitespace clean in tensor_mapping.py * 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 * Update llama-kv-cache.cpp * Review driven changes * style fix * indexer hparams are required * fix tests * 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>
297 lines
7.6 KiB
C++
297 lines
7.6 KiB
C++
#include "llama-hparams.h"
|
|
|
|
#include "ggml.h"
|
|
|
|
#include <algorithm>
|
|
#include <cassert>
|
|
|
|
void llama_hparams::set_swa_pattern(uint32_t n_pattern, bool dense_first) {
|
|
if (dense_first) {
|
|
for (uint32_t il = 0; il < n_layer(); ++il) {
|
|
is_swa_impl[il] = n_pattern == 0 || (il % n_pattern != 0);
|
|
}
|
|
} else {
|
|
for (uint32_t il = 0; il < n_layer(); ++il) {
|
|
is_swa_impl[il] = n_pattern == 0 || (il % n_pattern < (n_pattern - 1));
|
|
}
|
|
}
|
|
|
|
for (uint32_t il = n_layer(); il < n_layer_all; ++il) {
|
|
is_swa_impl[il] = false;
|
|
}
|
|
}
|
|
|
|
void llama_hparams::set_recr_pattern(uint32_t n_pattern, bool dense_first) {
|
|
if (dense_first) {
|
|
for (uint32_t il = 0; il < n_layer(); ++il) {
|
|
is_recr_impl[il] = n_pattern == 0 || (il % n_pattern != 0);
|
|
}
|
|
} else {
|
|
for (uint32_t il = 0; il < n_layer(); ++il) {
|
|
is_recr_impl[il] = n_pattern == 0 || (il % n_pattern < (n_pattern - 1));
|
|
}
|
|
}
|
|
|
|
for (uint32_t il = n_layer(); il < n_layer_all; ++il) {
|
|
is_recr_impl[il] = false;
|
|
}
|
|
}
|
|
|
|
bool llama_hparams::is_swa_any() const {
|
|
for (uint32_t il = 0; il < n_layer_all; ++il) {
|
|
if (is_swa_impl[il]) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_head(uint32_t il) const {
|
|
if (il < n_layer_all) {
|
|
return n_head_arr[il];
|
|
}
|
|
|
|
GGML_ABORT("fatal error");
|
|
}
|
|
|
|
uint32_t llama_hparams::n_head_kv(uint32_t il) const {
|
|
if (il < n_layer_all) {
|
|
return n_head_kv_arr[il];
|
|
}
|
|
|
|
GGML_ABORT("fatal error");
|
|
}
|
|
|
|
uint32_t llama_hparams::n_ff(uint32_t il) const {
|
|
if (il < n_layer_all) {
|
|
return n_ff_arr[il];
|
|
}
|
|
|
|
GGML_ABORT("fatal error");
|
|
}
|
|
|
|
uint32_t llama_hparams::n_gqa(uint32_t il) const {
|
|
const uint32_t n_head = this->n_head(il);
|
|
const uint32_t n_head_kv = this->n_head_kv(il);
|
|
|
|
if (n_head_kv == 0) {
|
|
return 0;
|
|
}
|
|
|
|
return n_head/n_head_kv;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_rot(uint32_t il) const {
|
|
if (il < n_layer_all) {
|
|
return is_swa(il) ? n_rot_swa : n_rot_full;
|
|
}
|
|
|
|
GGML_ABORT("fatal error");
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_inp() const {
|
|
if (n_embd_inp_impl > 0) {
|
|
return n_embd_inp_impl;
|
|
}
|
|
|
|
uint32_t n_embd_inp = n_embd;
|
|
|
|
if (n_deepstack_layers > 0) {
|
|
n_embd_inp += n_embd * n_deepstack_layers;
|
|
}
|
|
|
|
return n_embd_inp;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_inp_enc() const {
|
|
return n_embd_inp_enc_impl > 0 ? n_embd_inp_enc_impl : n_embd_inp();
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_out() const {
|
|
return n_embd_out_impl > 0 ? n_embd_out_impl : n_embd;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_head_k(uint32_t il) const {
|
|
if (il < n_layer_all) {
|
|
return is_swa(il) ? n_embd_head_k_swa : n_embd_head_k_full;
|
|
}
|
|
|
|
GGML_ABORT("fatal error");
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_head_v(uint32_t il) const {
|
|
if (il < n_layer_all) {
|
|
return is_swa(il) ? n_embd_head_v_swa : n_embd_head_v_full;
|
|
}
|
|
|
|
GGML_ABORT("fatal error");
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_k_gqa(uint32_t il) const {
|
|
const uint32_t n_head_kv = this->n_head_kv(il);
|
|
|
|
return n_embd_head_k(il) * n_head_kv;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_v_gqa(uint32_t il) const {
|
|
const uint32_t n_head_kv = this->n_head_kv(il);
|
|
|
|
return n_embd_head_v(il) * n_head_kv;
|
|
}
|
|
|
|
bool llama_hparams::is_n_embd_k_gqa_variable() const {
|
|
const uint32_t val = n_embd_k_gqa();
|
|
for (uint32_t il = 0; il < n_layer_all; ++il) {
|
|
if (val != n_embd_k_gqa(il)) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool llama_hparams::is_n_embd_v_gqa_variable() const {
|
|
const uint32_t val = n_embd_v_gqa();
|
|
for (uint32_t il = 0; il < n_layer_all; ++il) {
|
|
if (val != n_embd_v_gqa(il)) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_k_gqa_max() const {
|
|
uint32_t val = n_embd_k_gqa();
|
|
for (uint32_t il = 0; il < n_layer_all; ++il) {
|
|
val = std::max(val, n_embd_k_gqa(il));
|
|
}
|
|
|
|
return val;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_v_gqa_max() const {
|
|
uint32_t val = n_embd_v_gqa();
|
|
for (uint32_t il = 0; il < n_layer_all; ++il) {
|
|
val = std::max(val, n_embd_v_gqa(il));
|
|
}
|
|
|
|
return val;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_k_idx(uint32_t il) const {
|
|
if (!indexer_kv || indexer_head_size == 0) {
|
|
return 0; // arch without a MSA indexer
|
|
}
|
|
if (il < n_layer_dense_lead) {
|
|
return 0; // leading dense layers carry no indexer
|
|
}
|
|
return indexer_head_size; // 128
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_r() const {
|
|
if (wkv_head_size != 0) {
|
|
// for RWKV models
|
|
return token_shift_count * n_embd;
|
|
}
|
|
|
|
if (n_shortconv_l_cache != 0) {
|
|
// for LFM2 models
|
|
return n_embd * (n_shortconv_l_cache - 1);
|
|
}
|
|
|
|
if (n_embd_head_kda != 0) {
|
|
// for Kimi KDA layers
|
|
// Conv state for Q, K, V: 3 * (d_conv - 1) * n_head * head_dim
|
|
const uint32_t d_inner = n_head() * n_embd_head_kda; // 32 * 128 = 4096
|
|
return 3 * (ssm_d_conv > 0 ? ssm_d_conv - 1 : 3) * d_inner;
|
|
}
|
|
|
|
// TODO: maybe support other convolution strides than 1
|
|
// NOTE: since the first column of the conv_state is shifted out each time, it's not actually needed
|
|
// Corresponds to Mamba's conv_states size
|
|
return (ssm_d_conv > 0 ? ssm_d_conv - 1 : 0) * (ssm_d_inner + 2*ssm_n_group*ssm_d_state);
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_s() const {
|
|
if (wkv_head_size != 0) {
|
|
// corresponds to RWKV's wkv_states size
|
|
return n_embd * wkv_head_size;
|
|
}
|
|
|
|
if (n_embd_head_kda != 0) {
|
|
// for Kimi KDA layers
|
|
// Full recurrent state: head_dim * head_dim * n_head
|
|
// h tensor shape for delta attention: [head_dim, head_dim, n_head]
|
|
return n_embd_head_kda * n_embd_head_kda * n_head(); // 128 * 128 * 32 = 524288
|
|
}
|
|
|
|
// corresponds to Mamba's ssm_states size
|
|
return ssm_d_state * ssm_d_inner;
|
|
}
|
|
|
|
bool llama_hparams::is_recr(uint32_t il) const {
|
|
if (il < n_layer_all) {
|
|
return is_recr_impl[il];
|
|
}
|
|
|
|
GGML_ABORT("%s: il (%u) out of bounds (n_layer_all: %u)\n", __func__, il, n_layer_all);
|
|
}
|
|
|
|
uint32_t llama_hparams::n_pos_per_embd() const {
|
|
return rope_type == LLAMA_ROPE_TYPE_MROPE || rope_type == LLAMA_ROPE_TYPE_IMROPE ? 4 : 1;
|
|
}
|
|
|
|
bool llama_hparams::is_swa(uint32_t il) const {
|
|
if (il < n_layer_all) {
|
|
return is_swa_impl[il];
|
|
}
|
|
|
|
GGML_ABORT("%s: il (%u) out of bounds (n_layer_all: %u)\n", __func__, il, n_layer_all);
|
|
}
|
|
|
|
bool llama_hparams::is_mla() const {
|
|
assert((n_embd_head_k_mla_impl == 0 && n_embd_head_v_mla_impl == 0) ||
|
|
(n_embd_head_k_mla_impl != 0 && n_embd_head_v_mla_impl != 0));
|
|
|
|
return n_embd_head_k_mla_impl != 0 && n_embd_head_v_mla_impl != 0;
|
|
}
|
|
|
|
bool llama_hparams::is_indexer_full(uint32_t il) const {
|
|
if (il < n_layer()) {
|
|
return is_indexer_full_impl[il];
|
|
}
|
|
|
|
GGML_ABORT("%s: il (%u) out of bounds (n_layer: %u)\n", __func__, il, n_layer());
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_head_k_mla() const {
|
|
return is_mla() ? n_embd_head_k_mla_impl : n_embd_head_k();
|
|
}
|
|
|
|
uint32_t llama_hparams::n_embd_head_v_mla() const {
|
|
return is_mla() ? n_embd_head_v_mla_impl : n_embd_head_v();
|
|
}
|
|
|
|
bool llama_hparams::has_kv(uint32_t il) const {
|
|
if (n_layer_kv_from_start >= 0) {
|
|
if (il < (uint32_t) n_layer_kv_from_start) {
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
// by default, all layers have kv
|
|
return true;
|
|
}
|
|
|
|
uint32_t llama_hparams::n_layer() const {
|
|
return n_layer_all - n_layer_nextn;
|
|
}
|
|
|
|
bool llama_hparams::use_mrope() const {
|
|
return rope_sections[0] > 0 && rope_sections[1] > 0;
|
|
}
|