-
Notifications
You must be signed in to change notification settings - Fork 20.5k
model: Add PaddleOCR-VL model support #18825
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 11 commits
b4cde7c
64f0a46
fbfa906
54de283
0995fbb
6634ff1
73573b7
65e43e4
d54c871
0ab3b43
9d5a701
2f8c194
b9fd3c8
81de7fd
f8b30aa
89b2ce5
fa57ece
df44105
501080a
74ac94a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -284,6 +284,8 @@ class Clip: | |
| class ClipVision: | ||
| PROJECTOR_TYPE = "clip.vision.projector_type" # for mixed modality models | ||
| IMAGE_SIZE = "clip.vision.image_size" | ||
| MAX_PIXELS = "clip.vision.max_pixels" | ||
| MIN_PIXELS = "clip.vision.min_pixels" | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please use the correct naming from #18719
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done ~ |
||
| PREPROC_IMAGE_SIZE = "clip.vision.preproc_image_size" | ||
| PATCH_SIZE = "clip.vision.patch_size" | ||
| EMBEDDING_LENGTH = "clip.vision.embedding_length" | ||
|
|
@@ -456,6 +458,7 @@ class MODEL_ARCH(IntEnum): | |
| RND1 = auto() | ||
| PANGU_EMBED = auto() | ||
| MISTRAL3 = auto() | ||
| PADDLEOCR = auto() | ||
| MIMO2 = auto() | ||
| LLAMA_EMBED = auto() | ||
| MAINCODER = auto() | ||
|
|
@@ -877,6 +880,7 @@ class MODEL_TENSOR(IntEnum): | |
| MODEL_ARCH.RND1: "rnd1", | ||
| MODEL_ARCH.PANGU_EMBED: "pangu-embedded", | ||
| MODEL_ARCH.MISTRAL3: "mistral3", | ||
| MODEL_ARCH.PADDLEOCR: "paddleocr", | ||
| MODEL_ARCH.MIMO2: "mimo2", | ||
| MODEL_ARCH.LLAMA_EMBED: "llama-embed", | ||
| MODEL_ARCH.MAINCODER: "maincoder", | ||
|
|
@@ -3016,6 +3020,20 @@ class MODEL_TENSOR(IntEnum): | |
| MODEL_TENSOR.FFN_DOWN, | ||
| MODEL_TENSOR.FFN_UP, | ||
| ], | ||
| MODEL_ARCH.PADDLEOCR: [ | ||
| MODEL_TENSOR.TOKEN_EMBD, | ||
| MODEL_TENSOR.OUTPUT_NORM, | ||
| MODEL_TENSOR.OUTPUT, | ||
| MODEL_TENSOR.ATTN_NORM, | ||
| MODEL_TENSOR.ATTN_Q, | ||
| MODEL_TENSOR.ATTN_K, | ||
| MODEL_TENSOR.ATTN_V, | ||
| MODEL_TENSOR.ATTN_OUT, | ||
| MODEL_TENSOR.FFN_NORM, | ||
| MODEL_TENSOR.FFN_GATE, | ||
| MODEL_TENSOR.FFN_DOWN, | ||
| MODEL_TENSOR.FFN_UP, | ||
| ], | ||
| MODEL_ARCH.FALCON_H1: [ | ||
| # Token embedding | ||
| MODEL_TENSOR.TOKEN_EMBD, | ||
|
|
@@ -3610,6 +3628,7 @@ class VisionProjectorType: | |
| VOXTRAL = "voxtral" | ||
| LFM2 = "lfm2" | ||
| KIMIVL = "kimivl" | ||
| PADDLEOCR = "paddleocr" | ||
| LIGHTONOCR = "lightonocr" | ||
| COGVLM = "cogvlm" | ||
| JANUS_PRO = "janus_pro" | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what's the different between this and |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| #include "models.h" | ||
|
|
||
| llm_build_paddleocr::llm_build_paddleocr(const llama_model & model, const llm_graph_params & params) : | ||
| llm_graph_context(params) { | ||
| const int64_t n_embd_head = hparams.n_embd_head_v; | ||
|
|
||
| GGML_ASSERT(n_embd_head == hparams.n_embd_head_k); | ||
| GGML_ASSERT(n_embd_head == hparams.n_rot); | ||
|
|
||
| ggml_tensor * cur; | ||
| ggml_tensor * inpL; | ||
|
|
||
| inpL = build_inp_embd(model.tok_embd); | ||
|
|
||
| int sections[4]; | ||
| std::copy(std::begin(hparams.rope_sections), std::begin(hparams.rope_sections) + 4, sections); | ||
|
|
||
| // inp_pos - contains the positions | ||
| ggml_tensor * inp_pos = build_inp_pos(); | ||
|
|
||
| auto * inp_attn = build_attn_inp_kv(); | ||
|
|
||
| ggml_tensor * inp_out_ids = build_inp_out_ids(); | ||
|
|
||
| for (int il = 0; il < n_layer; ++il) { | ||
| ggml_tensor * inpSA = inpL; | ||
|
|
||
| // norm | ||
| { | ||
| cur = build_norm(inpL, model.layers[il].attn_norm, NULL, LLM_NORM_RMS, il); | ||
| cb(cur, "attn_norm", il); | ||
| } | ||
| // self-attention | ||
| { | ||
| ggml_tensor * Qcur = build_lora_mm(model.layers[il].wq, cur); | ||
| cb(Qcur, "Qcur", il); | ||
| if (model.layers[il].bq) { | ||
| Qcur = ggml_add(ctx0, Qcur, model.layers[il].bq); | ||
| cb(Qcur, "Qcur", il); | ||
| } | ||
| ggml_tensor * Kcur = build_lora_mm(model.layers[il].wk, cur); | ||
| cb(Kcur, "Kcur", il); | ||
| if (model.layers[il].bk) { | ||
| Kcur = ggml_add(ctx0, Kcur, model.layers[il].bk); | ||
| cb(Kcur, "Kcur", il); | ||
| } | ||
| ggml_tensor * Vcur = build_lora_mm(model.layers[il].wv, cur); | ||
| cb(Vcur, "Vcur", il); | ||
| if (model.layers[il].bv) { | ||
| Vcur = ggml_add(ctx0, Vcur, model.layers[il].bv); | ||
| cb(Vcur, "Vcur", il); | ||
| } | ||
| Qcur = ggml_reshape_3d(ctx0, Qcur, n_embd_head, n_head, n_tokens); | ||
| Kcur = ggml_reshape_3d(ctx0, Kcur, n_embd_head, n_head_kv, n_tokens); | ||
| Vcur = ggml_reshape_3d(ctx0, Vcur, n_embd_head, n_head_kv, n_tokens); | ||
|
|
||
| Qcur = ggml_rope_multi( | ||
| ctx0, Qcur, inp_pos, nullptr, | ||
| n_rot, sections, rope_type, n_ctx_orig, freq_base, freq_scale, | ||
| ext_factor, attn_factor, beta_fast, beta_slow | ||
| ); | ||
|
|
||
| Kcur = ggml_rope_multi( | ||
| ctx0, Kcur, inp_pos, nullptr, | ||
| n_rot, sections, rope_type, n_ctx_orig, freq_base, freq_scale, | ||
| ext_factor, attn_factor, beta_fast, beta_slow | ||
| ); | ||
|
|
||
| cb(Qcur, "Qcur", il); | ||
| cb(Kcur, "Kcur", il); | ||
| cb(Vcur, "Vcur", il); | ||
|
|
||
| cur = build_attn(inp_attn, | ||
| model.layers[il].wo, NULL, | ||
| Qcur, Kcur, Vcur, nullptr, nullptr, nullptr, 1.0f / sqrtf(float(n_embd_head)), il); | ||
| } | ||
| if (il == n_layer - 1) { | ||
| // skip computing output for unused tokens | ||
| cur = ggml_get_rows(ctx0, cur, inp_out_ids); | ||
| inpSA = ggml_get_rows(ctx0, inpSA, inp_out_ids); | ||
| } | ||
| ggml_tensor * ffn_inp = ggml_add(ctx0, cur, inpSA); | ||
| cb(ffn_inp, "ffn_inp", il); | ||
|
|
||
| // feed-forward network | ||
| { | ||
| cur = build_norm(ffn_inp, model.layers[il].ffn_norm, NULL, LLM_NORM_RMS, il); | ||
| cb(cur, "ffn_norm", il); | ||
|
|
||
| cur = build_ffn(cur, | ||
| model.layers[il].ffn_up, NULL, NULL, | ||
| model.layers[il].ffn_gate, NULL, NULL, | ||
| model.layers[il].ffn_down, NULL, NULL, | ||
| NULL, LLM_FFN_SILU, LLM_FFN_PAR, il); | ||
| cb(cur, "ffn_out", il); | ||
| } | ||
| cur = ggml_add(ctx0, cur, ffn_inp); | ||
|
|
||
| cur = build_cvec(cur, il); | ||
| cb(cur, "l_out", il); | ||
|
|
||
| // input for next layer | ||
| inpL = cur; | ||
| } | ||
| cur = inpL; | ||
|
|
||
| cur = build_norm(cur, model.output_norm, NULL, LLM_NORM_RMS, -1); | ||
|
|
||
| cb(cur, "result_norm", -1); | ||
| res->t_embd = cur; | ||
|
|
||
| // lm_head | ||
| cur = build_lora_mm(model.output, cur); | ||
|
|
||
| cb(cur, "result_output", -1); | ||
| res->t_logits = cur; | ||
|
|
||
| ggml_build_forward_expand(gf, cur); | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.