Commit f1ddf6e
merge: #3579's fused MoE chain under the hot-path contracts
Two conflicts in dasllama_common.das, both resolved to this branch:
kv_ensure — the growth loop is split into a [cold_path]
kv_grow_block_table here; master still had it inline.
Both sides had already moved to long_length, so the 64-bit
sweep merged silently — we ran the same fix independently.
scratch_resize — the @scratch parameter. #3579 arrived with a new comment on
the same function reading "grow-only no-init: contents are
stage output (fully overwritten)", which is independently
the exact property @scratch declares.
Their new moe_experts_chain needed one annotation: the fourth
team_parallel_stages lambda capture, same dispatch-API cost as the three
already marked. Everything else in it passes untouched, because its only
sizing op is s.chain_stages, already @scratch on this branch.
Verified on the merged tree with a daslang rebuilt for #3579's lattice
operators (ubyte16 >> int needs its C++): engine compiles clean, 65 changed
files lint clean, ENVIRONMENT.md shows no drift, PERF fixtures hold, and
test_fused_decode is 13/13 under -jit with the gpt-oss arm skipped for want of
the gguf.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>1 parent e05f055 commit f1ddf6e
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8363 | 8363 | | |
8364 | 8364 | | |
8365 | 8365 | | |
8366 | | - | |
| 8366 | + | |
8367 | 8367 | | |
8368 | 8368 | | |
8369 | 8369 | | |
| |||
0 commit comments