Repository navigation
Bump HRX: llama.cpp 6e42864a6 (3 fork commits: #203 Zamba2 shared block, #174 residency-decline log, #179 q/k dump) - #1082
bong-water-water-bong wants to merge 1 commit into
Conversation
…7d0815b Carries #179 (opt-in per-layer attention q/k dump behind LLAMA_ZHA_DUMP_DIR), #174 (log a residency decline so a budget that reshapes the graph is visible, engine #674) and #203 (store Zamba2's shared transformer block once per block, engine #1036 - a re-convert changes what the GGUF contains, not just what the loader does). No registry file moves in the three commits, so the HRX registry generated for 817d0815b still describes this pin.
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: READY on content — but this is byte-identical to #1075 and one of the two must be closed. Trees match exactly:
$ git diff bump/llama-pin-6e42864a6 <this head> --stat -> (empty)
third_party/llama.cpp 160000 commit 6e42864a628af8e97bc13b8e3ddb3dc7a72fc6d4 (same in both)
registry/architectures.json "llama.cpp (hrx)": "6e42864a628af..." (same in both)
I opened #1075 while reviewing #1073 (its replacement rule) at the same time this lane produced this one, so both did the same correct thing: the gitlink to the fork tip and the registry/architectures.json line that registry_pins requires, with the three commits — #203 Zamba2 shared block, #174 decline log, #179 q/k dump — none of which touches registry/, so no architecture count changes (hrx 297, npu 7, architectures 297, mapped 297, checked).
The only difference between the two PRs is the evidence attached, and it is not symmetric:
| #1075 (mine) | #1082 (this) | |
|---|---|---|
| content | identical | identical |
ci.yml build |
SUCCESS | pending |
pin guards (hrx-system gitlink agrees…, pinned loom-jit.cpp compiles…) |
SUCCESS | pending |
hw-gate |
ran: build PASS 184s (the HRX compile), ops 1959/1959, kat/needle/placement/kld green on 0.6B and zaya1-8b; 27B row refused by the memory pre-check (gate exit 2 = infrastructure, not this change) |
not run |
So my recommendation, in the terms that matter for the release: merge whichever you prefer, but if it is this one, label it hw-gate and let the build phase run — otherwise the HRX half of the bump ships unverified, which is exactly issue #1077 (the previous pin bump, #1039, shipped with hw_gate: SKIPPED). The HRX compile is the only check a pin bump cannot get from ci.yml.
If this one is the canonical PR, say so and I will close #1075 in favour of it — I would rather one PR with the evidence than two with half each. If #1075 is kept, this one can close; the content is not in question either way.
Not verified on this PR beyond the tree comparison: I took no GPU/NPU ticket for it, and my gate run belongs to #1075's branch.
PR Reviewer Guide 🔍Here are some key observations to aid the review process:
|
|
Closing in favour of #1075, per the review: the two trees are identical, and #1075 carries the evidence this one cannot — the This lane's record of the same bump, for whoever reads the history: the numbers that identified |
What moves
third_party/llama.cpp:817d0815ba5a→6e42864a628a— 3 commits, the fork's1bit/hrx-vulkan-patchedtip(
#1039already shipped817d0815baonmain, which is why this is 3 and not 28), plus the one line that records the pinin
registry/architectures.json. Nothing else:6e42864a6#203ffn_upstays per layer because of the per-layer MLP adapterb390c2db1#174(weight, op)pairs, then one suppression linec08e9510b#179LLAMA_ZHA_DUMP_DIR(debug only, no default-path change)Read this before bumping: #203 changes what a converted Zamba2 GGUF contains
Not just what the loader does. A Zamba2 converted at the old pin writes the shared attention block once per hybrid layer
(2 distinct sets × 13); after
#203a re-convert writes it once and aliases. An existing Zamba2 GGUF still loads (theloader handles both), but the file a re-convert produces is different, and it is smaller. Nothing about this affects
Qwen/DeepSeek/Zaya paths.
Registry
No registry content moves in the three commits — checked, not assumed — but the recorded pin does, so it is regenerated in
this PR:
The diff is one line (
"llama.cpp (hrx)": "817d0815ba…" -> "6e42864a62…"); the 297 architecture rows are unchanged, which isthe same evidence as the reviewer's "0 registry files in the three commits".
Verified on this box (strixhalo, gfx1201)
The engine was built at the new pin and the numbers that identified
817d0815blast night were re-taken, so this is a"nothing moved" check, not a fresh claim:
817d0815b(last night)6e42864a6(this PR)-dev none" The")-dev HRX0" The")The capital of France is Paris.2304 MiB128 MiBlibggml-hrx.soEngine built at the new pin under
thermal-run.sh 4: 39/39 targets, no errors. Provenance read out of the freshly linkedobjects rather than assumed — and this is a trap for the next lane: the build writes
libllama.so.0.0.50while theprevious pin's
0.0.47is still inbin/, so grepping the old file says "#179 is missing" when it is not.The two logit numbers being identical to six decimals across the bump is the strongest "nothing moved" statement
available here: the same prompt, the same two routes, the same two numbers, three reviewed commits later.
Not done here
buildjob; the arms above are behaviour checks.#203fixes, but it needs a convert + loadof a Zamba2 7B to close, which is a model run I did not do here. Say the word and it is a 20-minute job on this box.
Refs #1036, #674.