vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix conflicts

Browse source
This commit is contained in:
toyer 2024-07-03 02:55:47 +00:00
parent ec89d06f67
commit 80b381b940
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/llama.h
View file

@ -91,8 +91,7 @@ extern "C" {
LLAMA_VOCAB_PRE_TYPE_CHATGLM3 = 16,
LLAMA_VOCAB_PRE_TYPE_CHATGLM4 = 17,
LLAMA_VOCAB_PRE_TYPE_VIKING = 18,
LLAMA_VOCAB_PRE_TYPE_VIKING = 19,
LLAMA_VOCAB_PRE_TYPE_JAIS = 20,
LLAMA_VOCAB_PRE_TYPE_JAIS = 19,
};
// note: these values should be synchronized with ggml_rope

1
src/llama.cpp
View file

@ -12567,6 +12567,7 @@ struct llm_build_context {
cur = llm_build_norm(ctx0, ffn_inp, hparams,
model.layers[il].ffn_norm,
model.layers[il].ffn_norm_b,
LLM_NORM, cb, il);
cb(cur, "ffn_norm", il);
cur = llm_build_ffn(ctx0, cur,