Commit 7290ca9
committed
[GGUF FE] Simplify decoder API and refactor stateless/stateful KV cache
Refactor the frontend so conversion is device- and mode-agnostic, trim the
decoder interface to what the translators actually consume, drop dead code, and
make the frontend installable while hidden from FrontEndManager.
Decoder API:
- Surface GGUF weights as genuine GGML_OP_NONE leaf nodes (marked by a "data"
attribute) instead of a synthetic op.
- Make GgufDecoder node-scoped: visit_subgraph binds the decoder to one node and
the per-node accessors drop the node_idx parameter.
- Fold has_rope / use_per_op_rope / get_rope_config into a single
get_attribute("rope_config"); drop is_swa_layer, is_static, is_stateful,
get_model_output_shape and get_kv_param_res_names from the interface (they are
backend-internal or unused).
- Drop unused NodeContext members (translate_session, get_output_name) and the
dead, never-registered FuseToSDPA pass (the flash-attn translator emits
ScaledDotProductAttention directly, so there is nothing to fuse).
- Use the real ov::pass::MarkCompressedFloatConstants transformation (link
openvino::offline_transformations) instead of a hand-copied forward-declaration
header.
- Remove dead code carried over from the initial copy: unused translator
declarations (translate_add / translate_mul), unused utils helpers
(getCurrentTime, dump_ov_model, non_cont_dim, argsort_descend, sorted_descend,
is_permuted, permute), the unused make_fused_qkv_weights / slice_rows weight
splitters, the dead stateful branch/parameter of make_sin_cos, and the
never-defined get_shape(gguf_tensor) declaration (gguf_fill_mxfp4 now computes
rows/cols from tensor.dim directly, fixing a Windows link error).
Stateless / stateful KV cache:
- The frontend always emits the stateless, llama.cpp-faithful graph. Every ggml
SET_ROWS becomes an internal SetRows op, lowered in the normalization stage:
the built-in LowerSetRowsStateless rewrites it to ScatterUpdate by default.
- A caller (the ggml-openvino backend) may register a stateful lowering via
DecoderTransformationExtension to convert the attention KV writes into an
OpenVINO stateful ReadValue/Concat/Assign subgraph -- selected structurally,
with no decoder-side flag.
- The NPU-only SqueezeMatmul pass moves out of the frontend to the backend.
Install + discoverability:
- Install the frontend library and headers alongside the other frontends (drop
SKIP_INSTALL) so callers can link openvino::frontend::gguf directly, and add
the GGUF component to the Debian/RPM packaging (copyright, package name).
- Add FrontEndPluginInfo::m_hidden: a hidden frontend loads normally but is
excluded from FrontEndManager::get_available_front_ends() and from
load_by_model / load_by_framework. The GGUF frontend registers hidden (and
supported_impl returns false), so it is not exposed via the generic model
loading API while remaining usable by direct linkers.
Tests:
- expect_near uses a combined absolute + relative tolerance so the op tests pass
on hardware that runs the graph in fp16 (e.g. ARM CPU by default), where a
fixed fp32-tuned absolute tolerance is too tight.1 parent 3834a94 commit 7290ca9
36 files changed
Lines changed: 460 additions & 758 deletions
File tree
- cmake/packaging
- src/frontends
- common
- include/openvino/frontend
- src
- gguf
- include/openvino/frontend/gguf
- src
- helper_ops
- op
- pass
- quant
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
327 | 327 | | |
328 | 328 | | |
329 | 329 | | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
330 | 343 | | |
331 | 344 | | |
332 | 345 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
277 | 277 | | |
278 | 278 | | |
279 | 279 | | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
280 | 289 | | |
281 | 290 | | |
282 | 291 | | |
| |||
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
126 | 132 | | |
127 | 133 | | |
128 | 134 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
61 | 65 | | |
62 | 66 | | |
63 | 67 | | |
| |||
74 | 78 | | |
75 | 79 | | |
76 | 80 | | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
77 | 85 | | |
78 | 86 | | |
79 | 87 | | |
| |||
91 | 99 | | |
92 | 100 | | |
93 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
94 | 106 | | |
95 | 107 | | |
96 | 108 | | |
| |||
Lines changed: 40 additions & 50 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
31 | 35 | | |
32 | 36 | | |
33 | 37 | | |
34 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
35 | 46 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
40 | 50 | | |
41 | 51 | | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
42 | 55 | | |
43 | 56 | | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
| 57 | + | |
50 | 58 | | |
51 | | - | |
| 59 | + | |
52 | 60 | | |
53 | 61 | | |
54 | 62 | | |
55 | 63 | | |
56 | 64 | | |
57 | 65 | | |
58 | | - | |
| 66 | + | |
59 | 67 | | |
60 | | - | |
| 68 | + | |
61 | 69 | | |
62 | 70 | | |
63 | 71 | | |
64 | | - | |
65 | | - | |
66 | 72 | | |
67 | 73 | | |
68 | 74 | | |
69 | 75 | | |
70 | 76 | | |
71 | | - | |
| 77 | + | |
72 | 78 | | |
73 | | - | |
| 79 | + | |
74 | 80 | | |
75 | | - | |
| 81 | + | |
76 | 82 | | |
77 | | - | |
| 83 | + | |
78 | 84 | | |
79 | 85 | | |
80 | 86 | | |
81 | | - | |
82 | | - | |
83 | 87 | | |
84 | 88 | | |
85 | | - | |
86 | | - | |
87 | | - | |
| 89 | + | |
88 | 90 | | |
89 | | - | |
| 91 | + | |
90 | 92 | | |
91 | 93 | | |
92 | 94 | | |
93 | 95 | | |
94 | 96 | | |
95 | 97 | | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
120 | 110 | | |
121 | 111 | | |
122 | 112 | | |
| |||
Lines changed: 43 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
8 | 16 | | |
9 | 17 | | |
10 | | - | |
11 | 18 | | |
12 | | - | |
| 19 | + | |
13 | 20 | | |
14 | 21 | | |
15 | 22 | | |
| |||
27 | 34 | | |
28 | 35 | | |
29 | 36 | | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
| 37 | + | |
| 38 | + | |
0 commit comments