Skip to content

Commit a0b8c17

Browse files
pwilkinpwilkin
committed
Rename model source files, merge headers into models.h
1 parent dd41d9e commit a0b8c17

File tree

182 files changed

+555
-1539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+555
-1539
lines changed

‎src/CMakeLists.txt‎

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -35,96 +35,96 @@ add_library(llama
3535
unicode-data.cpp
3636
unicode.cpp
3737
unicode.h
38-
models/llm_build_apertus.cpp
39-
models/llm_build_arcee.cpp
40-
models/llm_build_arctic.cpp
41-
models/llm_build_arwkv7.cpp
42-
models/llm_build_baichuan.cpp
43-
models/llm_build_bailingmoe.cpp
44-
models/llm_build_bailingmoe2.cpp
45-
models/llm_build_bert.cpp
46-
models/llm_build_bitnet.cpp
47-
models/llm_build_bloom.cpp
48-
models/llm_build_chameleon.cpp
49-
models/llm_build_chatglm.cpp
50-
models/llm_build_codeshell.cpp
51-
models/llm_build_cohere2_iswa.cpp
52-
models/llm_build_command_r.cpp
53-
models/llm_build_dbrx.cpp
54-
models/llm_build_deci.cpp
55-
models/llm_build_deepseek.cpp
56-
models/llm_build_deepseek2.cpp
57-
models/llm_build_dots1.cpp
58-
models/llm_build_dream.cpp
59-
models/llm_build_ernie4_5_moe.cpp
60-
models/llm_build_ernie4_5.cpp
61-
models/llm_build_exaone.cpp
62-
models/llm_build_exaone4.cpp
63-
models/llm_build_falcon_h1.cpp
64-
models/llm_build_falcon.cpp
65-
models/llm_build_gemma_embedding.cpp
66-
models/llm_build_gemma.cpp
67-
models/llm_build_gemma2_iswa.cpp
68-
models/llm_build_gemma3_iswa.cpp
69-
models/llm_build_gemma3n_iswa.cpp
70-
models/llm_build_glm4_moe.cpp
71-
models/llm_build_glm4.cpp
72-
models/llm_build_gpt2.cpp
73-
models/llm_build_gptneox.cpp
74-
models/llm_build_granite_hybrid.cpp
75-
models/llm_build_granite.cpp
76-
models/llm_build_grok.cpp
77-
models/llm_build_grovemoe.cpp
78-
models/llm_build_hunyuan_dense.cpp
79-
models/llm_build_hunyuan_moe.cpp
80-
models/llm_build_internlm2.cpp
81-
models/llm_build_jais.cpp
82-
models/llm_build_jamba.cpp
83-
models/llm_build_lfm2.cpp
84-
models/llm_build_llada_moe.cpp
85-
models/llm_build_llada.cpp
86-
models/llm_build_llama_iswa.cpp
87-
models/llm_build_llama.cpp
88-
models/llm_build_mamba.cpp
89-
models/llm_build_minicpm3.cpp
90-
models/llm_build_mpt.cpp
91-
models/llm_build_nemotron_h.cpp
92-
models/llm_build_nemotron.cpp
93-
models/llm_build_neo_bert.cpp
94-
models/llm_build_olmo.cpp
95-
models/llm_build_olmo2.cpp
96-
models/llm_build_olmoe.cpp
97-
models/llm_build_openai_moe_iswa.cpp
98-
models/llm_build_openelm.cpp
99-
models/llm_build_orion.cpp
100-
models/llm_build_phi2.cpp
101-
models/llm_build_phi3.cpp
102-
models/llm_build_plamo.cpp
103-
models/llm_build_plamo2.cpp
104-
models/llm_build_plm.cpp
105-
models/llm_build_qwen.cpp
106-
models/llm_build_qwen2.cpp
107-
models/llm_build_qwen2moe.cpp
108-
models/llm_build_qwen2vl.cpp
109-
models/llm_build_qwen3.cpp
110-
models/llm_build_qwen3moe.cpp
111-
models/llm_build_refact.cpp
112-
models/llm_build_rwkv6_base.cpp
113-
models/llm_build_rwkv6.cpp
114-
models/llm_build_rwkv6qwen2.cpp
115-
models/llm_build_rwkv7_base.cpp
116-
models/llm_build_rwkv7.cpp
117-
models/llm_build_seed_oss.cpp
118-
models/llm_build_smallthinker.cpp
119-
models/llm_build_smollm3.cpp
120-
models/llm_build_stablelm.cpp
121-
models/llm_build_starcoder.cpp
122-
models/llm_build_starcoder2.cpp
123-
models/llm_build_t5_dec.cpp
124-
models/llm_build_t5_enc.cpp
125-
models/llm_build_wavtokenizer_dec.cpp
126-
models/llm_build_xverse.cpp
127-
models/llm_graph_context_mamba.cpp
38+
models/apertus.cpp
39+
models/arcee.cpp
40+
models/arctic.cpp
41+
models/arwkv7.cpp
42+
models/baichuan.cpp
43+
models/bailingmoe.cpp
44+
models/bailingmoe2.cpp
45+
models/bert.cpp
46+
models/bitnet.cpp
47+
models/bloom.cpp
48+
models/chameleon.cpp
49+
models/chatglm.cpp
50+
models/codeshell.cpp
51+
models/cohere2_iswa.cpp
52+
models/command_r.cpp
53+
models/dbrx.cpp
54+
models/deci.cpp
55+
models/deepseek.cpp
56+
models/deepseek2.cpp
57+
models/dots1.cpp
58+
models/dream.cpp
59+
models/ernie4_5_moe.cpp
60+
models/ernie4_5.cpp
61+
models/exaone.cpp
62+
models/exaone4.cpp
63+
models/falcon_h1.cpp
64+
models/falcon.cpp
65+
models/gemma_embedding.cpp
66+
models/gemma.cpp
67+
models/gemma2_iswa.cpp
68+
models/gemma3_iswa.cpp
69+
models/gemma3n_iswa.cpp
70+
models/glm4_moe.cpp
71+
models/glm4.cpp
72+
models/gpt2.cpp
73+
models/gptneox.cpp
74+
models/granite_hybrid.cpp
75+
models/granite.cpp
76+
models/grok.cpp
77+
models/grovemoe.cpp
78+
models/hunyuan_dense.cpp
79+
models/hunyuan_moe.cpp
80+
models/internlm2.cpp
81+
models/jais.cpp
82+
models/jamba.cpp
83+
models/lfm2.cpp
84+
models/llada_moe.cpp
85+
models/llada.cpp
86+
models/llama_iswa.cpp
87+
models/llama.cpp
88+
models/mamba.cpp
89+
models/minicpm3.cpp
90+
models/mpt.cpp
91+
models/nemotron_h.cpp
92+
models/nemotron.cpp
93+
models/neo_bert.cpp
94+
models/olmo.cpp
95+
models/olmo2.cpp
96+
models/olmoe.cpp
97+
models/openai_moe_iswa.cpp
98+
models/openelm.cpp
99+
models/orion.cpp
100+
models/phi2.cpp
101+
models/phi3.cpp
102+
models/plamo.cpp
103+
models/plamo2.cpp
104+
models/plm.cpp
105+
models/qwen.cpp
106+
models/qwen2.cpp
107+
models/qwen2moe.cpp
108+
models/qwen2vl.cpp
109+
models/qwen3.cpp
110+
models/qwen3moe.cpp
111+
models/refact.cpp
112+
models/rwkv6_base.cpp
113+
models/rwkv6.cpp
114+
models/rwkv6qwen2.cpp
115+
models/rwkv7_base.cpp
116+
models/rwkv7.cpp
117+
models/seed_oss.cpp
118+
models/smallthinker.cpp
119+
models/smollm3.cpp
120+
models/stablelm.cpp
121+
models/starcoder.cpp
122+
models/starcoder2.cpp
123+
models/t5_dec.cpp
124+
models/t5_enc.cpp
125+
models/wavtokenizer_dec.cpp
126+
models/xverse.cpp
127+
models/graph_context_mamba.cpp
128128
)
129129

130130
target_include_directories(llama PRIVATE .)

‎src/llama-model.cpp‎

Lines changed: 1 addition & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -13,95 +13,7 @@
1313

1414
#include "ggml-cpp.h"
1515

16-
#include "models/llm_graph_context_mamba.h"
17-
#include "models/llm_build_apertus.h"
18-
#include "models/llm_build_arcee.h"
19-
#include "models/llm_build_arctic.h"
20-
#include "models/llm_build_baichuan.h"
21-
#include "models/llm_build_bailingmoe.h"
22-
#include "models/llm_build_bailingmoe2.h"
23-
#include "models/llm_build_bert.h"
24-
#include "models/llm_build_bitnet.h"
25-
#include "models/llm_build_bloom.h"
26-
#include "models/llm_build_chameleon.h"
27-
#include "models/llm_build_chatglm.h"
28-
#include "models/llm_build_codeshell.h"
29-
#include "models/llm_build_cohere2_iswa.h"
30-
#include "models/llm_build_command_r.h"
31-
#include "models/llm_build_dbrx.h"
32-
#include "models/llm_build_deci.h"
33-
#include "models/llm_build_deepseek.h"
34-
#include "models/llm_build_deepseek2.h"
35-
#include "models/llm_build_dots1.h"
36-
#include "models/llm_build_dream.h"
37-
#include "models/llm_build_ernie4_5.h"
38-
#include "models/llm_build_ernie4_5_moe.h"
39-
#include "models/llm_build_exaone.h"
40-
#include "models/llm_build_falcon.h"
41-
#include "models/llm_build_falcon_h1.h"
42-
#include "models/llm_build_gemma.h"
43-
#include "models/llm_build_gemma2_iswa.h"
44-
#include "models/llm_build_gemma3_iswa.h"
45-
#include "models/llm_build_gemma3n_iswa.h"
46-
#include "models/llm_build_gemma_embedding.h"
47-
#include "models/llm_build_glm4.h"
48-
#include "models/llm_build_glm4_moe.h"
49-
#include "models/llm_build_gpt2.h"
50-
#include "models/llm_build_gptneox.h"
51-
#include "models/llm_build_granite.h"
52-
#include "models/llm_build_granite_hybrid.h"
53-
#include "models/llm_build_grok.h"
54-
#include "models/llm_build_grovemoe.h"
55-
#include "models/llm_build_hunyuan_dense.h"
56-
#include "models/llm_build_hunyuan_moe.h"
57-
#include "models/llm_build_internlm2.h"
58-
#include "models/llm_build_jais.h"
59-
#include "models/llm_build_jamba.h"
60-
#include "models/llm_build_lfm2.h"
61-
#include "models/llm_build_llada.h"
62-
#include "models/llm_build_llada_moe.h"
63-
#include "models/llm_build_llama.h"
64-
#include "models/llm_build_llama_iswa.h"
65-
#include "models/llm_build_mamba.h"
66-
#include "models/llm_build_minicpm3.h"
67-
#include "models/llm_build_mpt.h"
68-
#include "models/llm_build_nemotron.h"
69-
#include "models/llm_build_nemotron_h.h"
70-
#include "models/llm_build_neo_bert.h"
71-
#include "models/llm_build_olmo.h"
72-
#include "models/llm_build_olmoe.h"
73-
#include "models/llm_build_openai_moe_iswa.h"
74-
#include "models/llm_build_openelm.h"
75-
#include "models/llm_build_orion.h"
76-
#include "models/llm_build_phi2.h"
77-
#include "models/llm_build_plamo.h"
78-
#include "models/llm_build_plamo2.h"
79-
#include "models/llm_build_plm.h"
80-
#include "models/llm_build_qwen.h"
81-
#include "models/llm_build_qwen2.h"
82-
#include "models/llm_build_qwen2moe.h"
83-
#include "models/llm_build_qwen2vl.h"
84-
#include "models/llm_build_qwen3.h"
85-
#include "models/llm_build_qwen3moe.h"
86-
#include "models/llm_build_refact.h"
87-
#include "models/llm_build_rwkv_base.h"
88-
#include "models/llm_build_rwkv6.h"
89-
#include "models/llm_build_rwkv6qwen2.h"
90-
#include "models/llm_build_rwkv7.h"
91-
#include "models/llm_build_arwkv7.h"
92-
#include "models/llm_build_seed_oss.h"
93-
#include "models/llm_build_smollm3.h"
94-
#include "models/llm_build_stablelm.h"
95-
#include "models/llm_build_starcoder.h"
96-
#include "models/llm_build_starcoder2.h"
97-
#include "models/llm_build_t5_dec.h"
98-
#include "models/llm_build_t5_enc.h"
99-
#include "models/llm_build_wavtokenizer_dec.h"
100-
#include "models/llm_build_xverse.h"
101-
#include "models/llm_build_exaone4.h"
102-
#include "models/llm_build_olmo2.h"
103-
#include "models/llm_build_smallthinker.h"
104-
#include "models/llm_build_phi3.h"
16+
#include "models/models.h"
10517

10618
#include <algorithm>
10719
#include <cassert>

‎src/models/llm_build_apertus.cpp‎ renamed to ‎src/models/apertus.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#include "llm_build_apertus.h"
1+
#include "models.h"
22

3-
#include "../llama-graph.h"
4-
#include "../llama-model.h"
53

6-
#include <cmath>
74

85
llm_build_apertus::llm_build_apertus(const llama_model & model, const llm_graph_params & params) : llm_graph_context(params) {
96
const int64_t n_embd_head = hparams.n_embd_head_v;

‎src/models/llm_build_arcee.cpp‎ renamed to ‎src/models/arcee.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#include "../llama-model.h"
2-
#include "../llama-graph.h"
31

4-
#include "llm_build_arcee.h"
2+
#include "models.h"
53

6-
#include <cmath>
74

85
llm_build_arcee::llm_build_arcee(const llama_model & model, const llm_graph_params & params) : llm_graph_context(params) {
96
const int64_t n_embd_head = hparams.n_embd_head_v;

‎src/models/llm_build_arctic.cpp‎ renamed to ‎src/models/arctic.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#include "../llama-model.h"
2-
#include "../llama-graph.h"
31

4-
#include "llm_build_arctic.h"
2+
#include "models.h"
53

6-
#include <cmath>
74

85
llm_build_arctic::llm_build_arctic(const llama_model & model, const llm_graph_params & params) : llm_graph_context(params) {
96
const int64_t n_embd_head = hparams.n_embd_head_v;

‎src/models/llm_build_arwkv7.cpp‎ renamed to ‎src/models/arwkv7.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
#include "../llama-model.h"
2-
#include "../llama-graph.h"
31

4-
#include "llm_build_rwkv_base.h"
5-
#include "llm_build_arwkv7.h"
2+
#include "models.h"
63

7-
#include <cmath>
84

95
llm_build_arwkv7::llm_build_arwkv7(const llama_model & model, const llm_graph_params & params) : llm_build_rwkv7_base(model, params) {
106
GGML_ASSERT(n_embd == hparams.n_embd_r());

‎src/models/llm_build_baichuan.cpp‎ renamed to ‎src/models/baichuan.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#include "../llama-model.h"
2-
#include "../llama-graph.h"
31

4-
#include "llm_build_baichuan.h"
2+
#include "models.h"
53

6-
#include <cmath>
74

85
llm_build_baichuan::llm_build_baichuan(const llama_model & model, const llm_graph_params & params) : llm_graph_context(params) {
96
const int64_t n_embd_head = hparams.n_embd_head_v;

‎src/models/llm_build_bailingmoe.cpp‎ renamed to ‎src/models/bailingmoe.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#include "../llama-model.h"
2-
#include "../llama-graph.h"
31

4-
#include "llm_build_bailingmoe.h"
2+
#include "models.h"
53

6-
#include <cmath>
74

85
llm_build_bailingmoe::llm_build_bailingmoe(const llama_model & model, const llm_graph_params & params) : llm_graph_context(params) {
96
ggml_tensor * cur;

‎src/models/llm_build_bailingmoe2.cpp‎ renamed to ‎src/models/bailingmoe2.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#include "../llama-model.h"
2-
#include "../llama-graph.h"
31

4-
#include "llm_build_bailingmoe2.h"
2+
#include "models.h"
53

6-
#include <cmath>
74

85

96
llm_build_bailingmoe2::llm_build_bailingmoe2(const llama_model & model, const llm_graph_params & params) :

‎src/models/llm_build_bert.cpp‎ renamed to ‎src/models/bert.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#include "llm_build_bert.h"
1+
#include "models.h"
22

3-
#include "../llama-graph.h"
4-
#include "../llama-model.h"
53

6-
#include <cmath>
74

85
llm_build_bert::llm_build_bert(const llama_model & model, const llm_graph_params & params) : llm_graph_context(params) {
96
const int64_t n_embd_head = hparams.n_embd_head_v;

0 commit comments

Comments
 (0)