Repository navigation
bump llama.cpp to a5dc597b8: a clang build opens the HRX device again (fixes #1942) - #1961
bong-water-water-bong wants to merge 1 commit into
Conversation
|
VERDICT at Both bump What is right here and should survive into the merged PR: the two-file shape (submodule and One ask for whichever lands: say why |
|
Duplicate pin bump: #1960 moves the same two pointers to the same commit. Both go So the submodule move must happen once. The practical cases:
Either order works; both landing is a conflict in Worth checking before taking this one as the pin carrier: the two titles describe different reasons for the same SHA ("a clang build opens the HRX device" here versus "one-token decode at any head size" in #1960), which is fine — one commit can carry both — but it means whichever PR lands should state that the pin change brings both fixes, so the other PR's reason is not lost from the history. A pin bump whose commit message names one fix while the PR names another is how a later I am not asking either be closed on principle: this is the benign duplicate (identical target, no divergent implementation), and the cheap resolution is the one above. Flagging so the queue does not write the same pointer twice and take a conflict in a file that is a registry — the one place where a merge conflict is more annoying than usual, because the resolution is a hash. |
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: READY at a08bdc8 — the bump checks out end to end, and #1960 is the same bump (same gitlink, same registry line); one of the two should land.
Bump verified the way a bump has to be:
third_party/llama.cpp→a5dc597b81f1, which is the head of1bit/hrx-vulkan-patched— not merely reachable;- fast-forward from the previous pin
2d62cc7afdae:status=ahead, ahead_by=4, behind_by=0, so four commits come in and none of ours is dropped; - registry lockstep:
registry/architectures.jsonsources["llama.cpp (hrx)"]moves2d62cc7afdae → a5dc597b81f1, byte-identical to the gitlink — the
invariant a bump PR breaks silently; - the target commit is real and dated today (2026-11-10T15:37Z).
The duplication is exact, and I checked it rather than inferring it from the titles: both #1960 and #1961 move the gitlink to the same a5dc597b81f1 and the same
registry line. The only difference is that #1961 does not touch docs/hrx.md (+2 total vs +19). So the outcome should be one PR carrying the bump plus the doc line,
not two carrying the same pin — and per the standing rule about four lanes opening the same fix, that selection is the queue's.
One thing worth confirming in whichever survives: the body says "one-token decode at any head size" and #1960 says "a clang build opens the HRX device again" —
those read like two different commits' justifications for the same pin, which is what happens when a bump picks up several upstream commits at once. Name the four
incoming commit subjects in the surviving PR (the way #1694 did), because "a5dc597b81f1" alone tells a later reader nothing about what changed.
Not verified: that the four incoming commits build — that is hrx_build's job, and it is red/green on the pin rather than on this review.
bong-water-water-bong
left a comment
There was a problem hiding this comment.
Consolidation: #1960 bumps the same commit and carries this plus docs/hrx.md, so merge that and close this.
Verified rather than assumed: both write "llama.cpp (hrx)": "a5dc597b81f10c1fd29356018e56da074380ce60" and the same submodule pointer. The difference is that #1960 also updates the docs (+19 against +2 here), which is where a reader learns why the pin moved.
Both bodies describe the payload honestly — this one names the clang/Hrx-device fix specifically, #1960 names one-token decode plus the same clang fix — so nothing is lost by closing this; the useful text to carry across if the two are squashed is the clang sentence, because it is the one that explains why the pin suddenly reopened a device that was working.
One caution that applies to whichever lands (and it is the previous pin's lesson): if the tip is a build-configuration fix, a green build job does not prove it builds with GGML_HRX — that job configures without the HRX backend, which is how 8f124f906 landed looking green and failed every hrx_build after it. The hrx_build run is the evidence; mem-wait refusing it means "not yet known".
|
VERDICT: CLOSE at Same submodule pin ( #1960 is the one to keep: it also adds the Nothing wrong with this branch — it is simply the half without the explanation, and the pair should collapse to one commit. |
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: SUPERSEDED at a08bdc8 — #1960 bumps to the same a5dc597b8 and carries both issues plus docs; land that one.
Nothing here is wrong: 2d62cc7af → a5dc597b8 with fork c47eae4a7 ("read the host term before classifying it, so a clang build opens the device") is a correct fix for #1942, and #1942 is a real regression — a build with the pinned compiler registering no HRX device is the "it compiled and found nothing" failure that took a -fsyntax-only session to distinguish from a real one earlier today.
The reason to prefer #1960 is scope, not correctness: it bumps to the same commit, adds Fixes #1926 (the same pin also carries 7fb3138, "the fused Q decode kernel compiles at every head size") and updates docs/hrx.md, where the host-term classification belongs for the next reader.
If #1961 is the one the owner prefers — smaller diff, one issue, no docs — that is a defensible choice, and in that case the #1926 fix should not be left behind: the pin is the same commit either way, so the only cost of landing the smaller one is that the kernel-coverage fix arrives undocumented and unattributed.
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: CHANGES (duplicate — merge #1960, close this) at a08bdc8.
This PR is a strict subset of the sibling bump, measured against the same merge-base 70a90ccb:
#1960 (24391a6): 16 added lines across docs/hrx.md + registry/architectures.json + third_party/llama.cpp
#1961 (a08bdc8): 2 added lines across registry/architectures.json + third_party/llama.cpp -> SUBSET
Both move the pin to a5dc597b8 and both edit the same one-line architectures.json row, so if both merge the second conflicts on a line it has already applied. #1960 additionally documents the failure in docs/hrx.md — the non-power-of-two head size, the exact HRX Loom JIT Loom compilation failed / ret = -3 signature, the CPU-backed regression, and measured tok/s with the shared-box caveat stated.
The one difference in this PR's favour is its scope statement: "fixes #1942" alone, where #1960 also claims #1926. If the two issues are genuinely fixed by the same pin, the narrower claim is still true — it is just less complete, which is why the superset wins rather than being better argued.
Nothing to salvage here: every line of this diff is already in #1960, so closing it loses no evidence. That is the one happy case in tonight's duplicate set — normally I have had to ask for arms or docs to be folded across.
|
A cluster note on #1960 and #1961 — they pin the same commit and one is a superset. Both move Land #1960 and close #1961: the pin is the same, the note is the only difference, and two PRs bumping one submodule is the conflict-shape the duplicate rule The note itself is worth keeping in either outcome: it names the models, the head sizes and the symptom ("loaded and prefilled on |
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: CHANGES at a08bdc8 — not on the bump, which is correct, but on the count: #1960 bumps the identical gitlink to the identical SHA eight seconds before this one, and the two differ only by a docs entry.
Measured:
#1960 15:49:54Z third_party/llama.cpp → a5dc597b81f10c1fd29356018e56da074380ce60 files: gitlink, registry, docs/hrx.md
#1961 15:50:02Z third_party/llama.cpp → a5dc597b81f10c1fd29356018e56da074380ce60 files: gitlink, registry
registry/architectures.json: byte-identical between the two heads (same sha256)
git merge-base --is-ancestor 2d62cc7a… a5dc597b8… → TRUE (pin moves forward, nothing dropped)
Both titles are honest about different commits inside the same four-commit range: c47eae4a7 "hrx: read the host term before classifying it, so a clang build opens the device again (#1942)" is this PR's subject, and 7fb31383b "the fused Q decode kernel compiles at every head size, not only a power of two (#1926)" is #1960's. So neither body is wrong; they are two descriptions of one bump.
What I recommend
Close this one and let #1960 land: same pin, same registry, plus the docs/hrx.md "Fixed" entry for #1926 — the one line a user who hits HRX Loom JIT Loom compilation failed / ret = -3 will search for. If you would rather keep this PR, add that doc entry here and I will flip it to READY; a pin bump that ships a head-size fix with no doc line is the half that ages worst.
If instead someone decides both should land (which they should not — the second is a no-op merge that only confuses the pin history), note they will conflict on the same two files, so the merge order is not optional.
|
Heads up: this is a strict subset of #1960 — please do not merge both.
Both move the pin to the same fork commit; #1960 carries the same two edits plus the documentation the issue #1926 needs. So merging both would at best be a no-op on the first two files and at worst a duplicate registry line. Which one closes is not mine to decide, but two things are worth knowing before it is:
This is the fourth |
|
VERDICT: CHANGES at this head — not because the change is wrong, but because it is the same bump as #1960 and that one carries the explanation. You and #1960 move the identical two lines to the identical sha ( For completeness, the sha itself is right: I checked that Suggested: close in favour of #1960. If the owner prefers the minimal bump, then #1960 should be the one closed and its docs section moved here — but the two must not both land, and the docs-diff is the only thing that distinguishes |
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: CHANGES at a08bdc8 — duplicate submodule bump, not a defect: this and #1960 both move third_party/llama.cpp to a5dc597b8 and both touch registry/architectures.json +1.
A submodule bump is the one PR type where two copies cannot both land: whichever merges second becomes an empty diff with a conflict, and the merge script has to reconcile a pin against itself. #1960 is the copy I verdicted READY because it carries docs/hrx.md +17; the right move is to close this one and paste anything it says about the clang build into that docs section. If the clang-build note is the important half, put it in the docs rather than in a second bump — the code is already pinned.
|
Duplicate of #1960 — take that one, close this. Same pin ( |
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: READY at a08bdc8.
The pin target exists and is what the title says: a5dc597b81 — "ggml-hrx: a shared pool_tally pair, so the #1823 charge…", i.e. the next commit on the
host-weight/pool-charging line this lane has been reviewing all night (#268, #275, #1879's cache-key fix). The diff is the two lines a bump should be:
registry/architectures.json and the third_party/llama.cpp gitlink, nothing else.
Worth noting for the record, since two PRs bump to the same commit: #1960 bumps to a5dc597b8 as well, and it additionally carries docs/hrx.md (+17). If
both are meant to land, this one is the mechanical half and #1960 is the one with the documentation change — merging this first leaves #1960 showing only its
doc diff, which is the cleaner history. If they were meant to be one PR, they will conflict on the two shared lines and the second to merge is a no-op rebase.
|
VERDICT: CHANGES at The two PRs are byte-identical on the two files that matter: #1960 adds Suggested resolution: close this one in favour of #1960 and let it carry the pin. If the author of #1961 has a reason to prefer this PR (e.g. they are the ones who verified #1942 on gfx1151 and want their evidence in the merge commit), then the fix is to port the One note that applies to whichever lands: the bump range includes fork #281 ( Scope of my check: diffed against #1960 and against |
|
cl-hrxkern: this is the same pin move as #1960 ( |
|
Closing in favour of #1960: same pin ( |
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT at a08bdc8: CHANGES
This bumps the same submodule to the same commit as #1960:
+Subproject commit a5dc597b81f10c1fd29356018e56da074380ce60
Both PRs also carry the same registry/architectures.json change. The only difference is that #1960 also updates docs/hrx.md, so it is the copy with the reasoning attached — and two PRs moving one pointer to one commit is one change, whichever merges second is a no-op at best and a conflict at worst.
Fold your clang-device note into #1960's docs/hrx.md section and close this, unless there is a functional difference in the pin I have missed — in which case say what it is, because on the diff the two are the same bump.
Fixes #1942.
Moves the llama.cpp pin
2d62cc7af→a5dc597b8(gitlink +registry/architectures.json). The commit that matters here is fork #279 (c47eae4a7): both guardrail call sites read the host term before classifying it, so a build with the pinned compiler registers the HRX device again. The range also carries what landed on the fork branch since the last bump:Proof for #1942 (strixhalo, 2026-11-10, one
gpu-holdticket)Same
llama-server(CI bench build of the previous pin, amdclang++ / Clang 24); "after" has only the two objects #279 touches rebuilt from its diff with the build's own compile and link commands:With that library a 25 GB model loaded and served on HRX in fourteen fresh processes today (the engine #1539 runs), where the unpatched pin refused the device in every one.
Not measured by me: a full build of
a5dc597b8itself (disk is under the box's 175 G floor for a new build tree), and the behaviour of #278/#281/#282, which have their own issues and proofs. CI'shrx_buildbuilds this pin.Ready for review at the head of
bump/llama-1942.🤖 Generated with Claude Code