Repository navigation
third_party: bump llama.cpp to the fit-probe fix, so main builds its own payload again - #1265
bong-water-water-bong wants to merge 1 commit into
Conversation
…own payload again
`ced49c61` (this pin) hands `model.arch_name()` - a std::string - to `LLAMA_LOG_WARN`, which is a printf-style variadic:
src/llama-context.cpp:160:42: error: cannot pass non-trivial object of type 'std::string'
to variadic function; expected type from format string was 'char *' [-Wnon-pod-varargs]
Clang refuses it, so `weekly.sh build` on main has not produced a payload since #1260 bumped this pin in - the c31 stick
cannot be rolled. The line is ours (it carries the `engine #681` comment), and it is the only such instance in the tree.
The fix is in 1bit-MONSTER/llama.cpp PR #223, commit 198a451c7: `model.arch_name().c_str()`, one token, behaviour
unchanged.
Repointed the submodule at that commit rather than a merge commit so this PR is mergeable the moment #223 lands; the
commit is on the fork's branch either way and stays reachable from master after a merge. Verified by rebuilding the
targets that failed under the engine's own toolchain (HRX clang): `cmake --build build/hrx/llama --target llama-server
llama-bench llama-perplexity` compiles this file and proceeds, 0 errors where it previously stopped.
|
Superseded before review: the fork already carries this fix as ab79894d (fork PR #220, merged 11:22 — |
|
These two pin bumps are equivalent — measured, so the owner does not have to judge between them.
So pi-os3's build proof carries over to either pin unchanged ( The only real difference is what the pin tracks: |
This is the unblock for c31. The pin
ced49c61(bumped in by #1260) hands astd::stringto a printf-style variadic, sothe engine's own payload build stops:
Clang refuses it and
weekly.sh build(HRX toolchain,amdclang++) has not produced a payload since. The line is ours — itcarries the
engine #681comment (the memory-fitting probe has no target context) — and it is the only such instance inthe tree.
198a451c7:model.arch_name()→model.arch_name().c_str(), one token, behaviour unchangedcmake --build build/hrx/llama --target llama-server llama-bench llama-perplexitycompiles the file and proceeds with 0 errors, where it previously stopped on this lineThe submodule is repointed at
198a451c7(the fix commit) rather than a merge commit so this PR is mergeable the moment #223lands — the commit stays reachable from
mastereither way, and this can be repointed to the merge commit if you prefer thatconvention.
After this merges: the payload roll runs (
build package), which is what makes the c31 stick possible; the Lemonade bump (#1263)is still the other, independent gate for c31's content.