-
Notifications
You must be signed in to change notification settings - Fork 15.1k
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
Merged
+327
−0
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
b4cde7c
support PaddleOCR-VL
megemini 64f0a46
clip: update PaddleOCR model loader parameters to prevent OOM during …
megemini fbfa906
[update] add paddleocr vl text model instead of ernie4.5
megemini 54de283
Merge branch 'master' of https://github.com/ggml-org/llama.cpp into p…
megemini 0995fbb
[update] restore change of minicpmv
megemini 6634ff1
Merge branch 'master' of https://github.com/ggml-org/llama.cpp into p…
megemini 73573b7
[update] format
megemini 65e43e4
[update] format
megemini d54c871
[update] positions and patch merge permute
megemini 0ab3b43
Merge branch 'master' of https://github.com/ggml-org/llama.cpp into p…
megemini 9d5a701
[update] mtmd_decode_use_mrope for paddleocr
megemini 2f8c194
[update] image min/max pixels
megemini b9fd3c8
Merge branch 'master' of https://github.com/ggml-org/llama.cpp into p…
megemini 81de7fd
[update] remove set_limit_image_tokens
megemini f8b30aa
upate: preprocess without padding
megemini 89b2ce5
Merge branch 'master' into paddleocr-vl
ngxson fa57ece
clean up
ngxson df44105
Merge branch 'master' into paddleocr-vl
ngxson 501080a
Update convert_hf_to_gguf.py
megemini 74ac94a
Update convert_hf_to_gguf.py
megemini File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| #include "models.h" | ||
|
|
||
| llm_build_paddleocr::llm_build_paddleocr(const llama_model & model, const llm_graph_params & params) : | ||
| llm_graph_context(params) { | ||
|
|
||
| // NOTE: same with qwen2vl.cpp, but bias tensors are optional | ||
|
|
||
| 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, model.layers[il].bo, | ||
| 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); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.