From 0ccb74fbf465bec5144a674208a17d0e07b949dc Mon Sep 17 00:00:00 2001 From: bcloud Date: Sat, 14 Nov 2026 15:11:40 -0400 Subject: [PATCH] third_party/llama.cpp: pin to the fork head c84f0fc6e -- Flash-Next's load fix, the decode policy, and per-arch test isolation Five commits on the fork head 59967468e, nine files, none of them in ggml-hrx's runtime or kernel corpus: c84f0fc6e test-llama-archs: one child process per architecture, so an abort marks its row (engine#2444) (#383) a621453cd test-llama-archs: zaya's mixed-batch column is SKIP, not a coin toss (engine#2444) (#382) 1f107b11d qwen4exp: drop two pre-#327 blocks AMD's design replaced (Flash-Next could not load); blackmamba loads (#381) 550d06f92 hrx: one-token decode with a mixed-format gate/up runs unfused (+1.5 % on Qwen3.8-27B Q4_K_M) (#380) a74752b64 tests: test-mtp-one-request, one llama-server request with MTP drafting on the CPU (engine#2433) (#379) Why the head and not a sha behind it: 550d06f92 is the exact tree whose row in #381 read "abort at context creation", so pinning short of it ships a llama.cpp in which Flash-Next cannot load. The last two commits are test-only (7 and 143 lines in tests/test-llama-archs.cpp). Verified at this pin (fork build-ops, c84f0fc6e checked out): * BUILD_RC=0 * test-llama-archs -> Summary: all 172 architecture(s) passed, each in its own process The count is not comparable to the 149 reported before #383: that number counted test rows, this one counts architectures, one child each. The harness now says so in its own summary line, which is the property that matters -- an assert, a SIGBUS or an OOM kill reddens THAT row instead of ending the table. Which is not hypothetical: my first run at a621453cd died rc=135 (SIGBUS) at row 3 with 11.4 % iowait and four D-state processes, and an immediate retry of the same binary passed all 149. Under the old harness that crash was indistinguishable from a model regression from the exit code alone. * the dispatch change is plan-level, so its own cases need no device. At 1f107b11d: 2 passed, 0 failed, 0 known-fail, 0 unexpected-pass of the two discriminating cases; at 59967468e all three ran as 2 passed / 1 known-fail / 0 unexpected-pass, and q4k_q6k.t1 FAILS at the pre-#380 base. * registry regenerated for the new pin, tools/registry_build.py --check-pins rc 0 Not run, and not claimed: hrx-buffer-test's 9 device cases and #379's test-mtp-one-request.sh both need the GPU, which other lanes' hw-gate run and tickets have held all evening (the run I did printed 'test skipped: no device available'). Nothing in these five commits touches a buffer, an import or the MTP drafter. --- registry/architectures.json | 2 +- third_party/llama.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/registry/architectures.json b/registry/architectures.json index db1cd6526..8b5394232 100644 --- a/registry/architectures.json +++ b/registry/architectures.json @@ -1,7 +1,7 @@ { "about": "HF architecture -> GGUF architecture and the backends whose code accepts it. Generated by tools/registry_build.py from the pinned sources; do not edit.", "sources": { - "llama.cpp (hrx)": "59967468e9cb0f19f9535a04aa09e4166a002d8c" + "llama.cpp (hrx)": "c84f0fc6ecf4ae1106201e93616a09c150e9cc54" }, "counts": { "hrx": 350, diff --git a/third_party/llama.cpp b/third_party/llama.cpp index 59967468e..c84f0fc6e 160000 --- a/third_party/llama.cpp +++ b/third_party/llama.cpp @@ -1 +1 @@ -Subproject commit 59967468e9cb0f19f9535a04aa09e4166a002d8c +Subproject commit c84f0fc6ecf4ae1106201e93616a09c150e9cc54