Commit 9bdf04e
committed
Add per-layer hybrid sliding/full attention to CoreML static LLM export
Builds on the prior --sliding_window flag. Gemma 3, Gemma 4, and the
Llama 4 Scout family interleave sliding and full attention layers
rather than using one global setting: Gemma 4 E2B is '4 sliding + 1
full' repeated 7 times across 35 layers; Gemma 3 is '5 sliding + 1
full' repeated. HuggingFace expresses this as a single integer
`sliding_window_pattern`, which is what the new
`--sliding_window_pattern` flag mirrors.
Implementation:
- `_resolve_per_layer_cache_lens(...)` produces a per-layer cache_lens
list using the HF rule (layer i is full iff (i+1) % P == 0); the
IO manager and the model already accept per-layer cache_lens, so the
attention mask dict and the per-layer KV cache shapes follow.
- `_get_metadata` now reads each cache's cache_len from the example
tensor's sequence dimension instead of receiving a single scalar,
so the C++ runner metadata describes each layer correctly under
hybrid attention.
- Both single-method and multifunction export paths use the per-layer
resolver.
The previous PR's uniform-sliding behavior is preserved when
`--sliding_window_pattern` is not set.
Authored with Claude.1 parent 8a2dfb5 commit 9bdf04e
3 files changed
Lines changed: 251 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
193 | 193 | | |
194 | 194 | | |
195 | 195 | | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
196 | 241 | | |
197 | 242 | | |
198 | 243 | | |
| |||
296 | 341 | | |
297 | 342 | | |
298 | 343 | | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
299 | 348 | | |
300 | 349 | | |
301 | 350 | | |
| |||
304 | 353 | | |
305 | 354 | | |
306 | 355 | | |
307 | | - | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
308 | 360 | | |
309 | 361 | | |
310 | 362 | | |
| |||
445 | 497 | | |
446 | 498 | | |
447 | 499 | | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
448 | 513 | | |
449 | 514 | | |
450 | 515 | | |
| |||
516 | 581 | | |
517 | 582 | | |
518 | 583 | | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
519 | 587 | | |
520 | 588 | | |
521 | 589 | | |
| |||
525 | 593 | | |
526 | 594 | | |
527 | 595 | | |
| 596 | + | |
| 597 | + | |
528 | 598 | | |
529 | 599 | | |
530 | 600 | | |
| |||
552 | 622 | | |
553 | 623 | | |
554 | 624 | | |
555 | | - | |
556 | | - | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
557 | 631 | | |
558 | 632 | | |
559 | | - | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
560 | 641 | | |
561 | 642 | | |
562 | 643 | | |
| |||
680 | 761 | | |
681 | 762 | | |
682 | 763 | | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
683 | 778 | | |
684 | 779 | | |
685 | 780 | | |
686 | 781 | | |
687 | 782 | | |
688 | 783 | | |
689 | | - | |
| 784 | + | |
690 | 785 | | |
691 | 786 | | |
692 | 787 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| 73 | + | |
73 | 74 | | |
74 | 75 | | |
75 | 76 | | |
| |||
95 | 96 | | |
96 | 97 | | |
97 | 98 | | |
98 | | - | |
| 99 | + | |
99 | 100 | | |
100 | 101 | | |
101 | 102 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
15 | 19 | | |
16 | 20 | | |
17 | 21 | | |
| |||
122 | 126 | | |
123 | 127 | | |
124 | 128 | | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
125 | 265 | | |
126 | 266 | | |
127 | 267 | | |
128 | 268 | | |
129 | 269 | | |
130 | 270 | | |
131 | 271 | | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
0 commit comments