Skip to content

Commit 474c7fb

Browse files
committed
feat(granitemoe): Implement granitemoe
GraniteMoE follows the mixtral architecture (once the input_linear layers are split into gate_exps/up_exps). The main delta is the addition of the same four multipliers used in Granite. Branch: GraniteMoE Signed-off-by: Gabe Goodhart <[email protected]>
1 parent 4f07702 commit 474c7fb

File tree

1 file changed

+26
-2
lines changed

1 file changed

+26
-2
lines changed

src/llama.cpp

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ enum llm_arch {
215215
LLM_ARCH_EXAONE,
216216
LLM_ARCH_RWKV6,
217217
LLM_ARCH_GRANITE,
218+
LLM_ARCH_GRANITE_MOE,
218219
LLM_ARCH_UNKNOWN,
219220
};
220221

@@ -266,6 +267,7 @@ static const std::map<llm_arch, const char *> LLM_ARCH_NAMES = {
266267
{ LLM_ARCH_EXAONE, "exaone" },
267268
{ LLM_ARCH_RWKV6, "rwkv6" },
268269
{ LLM_ARCH_GRANITE, "granite" },
270+
{ LLM_ARCH_GRANITE_MOE, "granitemoe" },
269271
{ LLM_ARCH_UNKNOWN, "(unknown)" },
270272
};
271273

@@ -1478,6 +1480,23 @@ static const std::map<llm_arch, std::map<llm_tensor, std::string>> LLM_TENSOR_NA
14781480
{ LLM_TENSOR_FFN_UP, "blk.%d.ffn_up" },
14791481
},
14801482
},
1483+
{
1484+
LLM_ARCH_GRANITE_MOE,
1485+
{
1486+
{ LLM_TENSOR_TOKEN_EMBD, "token_embd" },
1487+
{ LLM_TENSOR_OUTPUT_NORM, "output_norm" },
1488+
{ LLM_TENSOR_ATTN_NORM, "blk.%d.attn_norm" },
1489+
{ LLM_TENSOR_ATTN_Q, "blk.%d.attn_q" },
1490+
{ LLM_TENSOR_ATTN_K, "blk.%d.attn_k" },
1491+
{ LLM_TENSOR_ATTN_V, "blk.%d.attn_v" },
1492+
{ LLM_TENSOR_ATTN_OUT, "blk.%d.attn_output" },
1493+
{ LLM_TENSOR_FFN_NORM, "blk.%d.ffn_norm" },
1494+
{ LLM_TENSOR_FFN_GATE_INP, "blk.%d.ffn_gate_inp" },
1495+
{ LLM_TENSOR_FFN_GATE_EXPS, "blk.%d.ffn_gate_exps" },
1496+
{ LLM_TENSOR_FFN_DOWN_EXPS, "blk.%d.ffn_down_exps" },
1497+
{ LLM_TENSOR_FFN_UP_EXPS, "blk.%d.ffn_up_exps" },
1498+
},
1499+
},
14811500
{
14821501
LLM_ARCH_UNKNOWN,
14831502
{
@@ -2396,7 +2415,7 @@ struct llama_hparams {
23962415
float f_max_alibi_bias = 0.0f;
23972416
float f_logit_scale = 0.0f;
23982417

2399-
// Additional scale factors (Granite)
2418+
// Additional scale factors (Granite/Granite MoE)
24002419
float f_residual_scale = 0.0f;
24012420
float f_embedding_scale = 0.0f;
24022421
float f_attention_scale = 0.0f;
@@ -6048,6 +6067,7 @@ static void llm_load_hparams(
60486067
}
60496068
} break;
60506069
case LLM_ARCH_GRANITE:
6070+
case LLM_ARCH_GRANITE_MOE:
60516071
{
60526072
ml.get_key(LLM_KV_ATTENTION_LAYERNORM_RMS_EPS, hparams.f_norm_rms_eps);
60536073
ml.get_key(LLM_KV_LOGIT_SCALE, hparams.f_logit_scale);
@@ -6056,6 +6076,7 @@ static void llm_load_hparams(
60566076
ml.get_key(LLM_KV_ATTENTION_SCALE, hparams.f_attention_scale);
60576077

60586078
switch (hparams.n_layer) {
6079+
case 32: model.type = e_model::MODEL_3B; break;
60596080
case 40: model.type = e_model::MODEL_3B; break;
60606081
// Add additional layer/vocab/etc checks here for other model sizes
60616082
default: model.type = e_model::MODEL_UNKNOWN;
@@ -6767,7 +6788,7 @@ static void llm_load_print_meta(llama_model_loader & ml, llama_model & model) {
67676788
LLAMA_LOG_INFO("%s: n_ff_shexp = %d\n", __func__, hparams.n_ff_shexp);
67686789
}
67696790

6770-
if (model.arch == LLM_ARCH_GRANITE) {
6791+
if (model.arch == LLM_ARCH_GRANITE || model.arch == LLM_ARCH_GRANITE_MOE) {
67716792
LLAMA_LOG_INFO("%s: f_embedding_scale = %f\n", __func__, hparams.f_embedding_scale);
67726793
LLAMA_LOG_INFO("%s: f_residual_scale = %f\n", __func__, hparams.f_residual_scale);
67736794
LLAMA_LOG_INFO("%s: f_attention_scale = %f\n", __func__, hparams.f_attention_scale);
@@ -6941,6 +6962,7 @@ static bool llm_load_tensors(
69416962
case LLM_ARCH_REFACT:
69426963
case LLM_ARCH_MINICPM:
69436964
case LLM_ARCH_GRANITE:
6965+
case LLM_ARCH_GRANITE_MOE:
69446966
{
69456967
model.tok_embd = ml.create_tensor(ctx_input, tn(LLM_TENSOR_TOKEN_EMBD, "weight"), {n_embd, n_vocab});
69466968

@@ -15868,6 +15890,7 @@ static struct ggml_cgraph * llama_build_graph(
1586815890
switch (model.arch) {
1586915891
case LLM_ARCH_LLAMA:
1587015892
case LLM_ARCH_GRANITE:
15893+
case LLM_ARCH_GRANITE_MOE:
1587115894
{
1587215895
result = llm.build_llama();
1587315896
} break;
@@ -19169,6 +19192,7 @@ enum llama_rope_type llama_rope_type(const struct llama_model * model) {
1916919192
case LLM_ARCH_DEEPSEEK2:
1917019193
case LLM_ARCH_CHATGLM:
1917119194
case LLM_ARCH_GRANITE:
19195+
case LLM_ARCH_GRANITE_MOE:
1917219196
return LLAMA_ROPE_TYPE_NORM;
1917319197

1917419198
// the pairs of head values are offset by n_rot/2

0 commit comments

Comments
 (0)