Bump llama.cpp to b10665 (ca3d5a3e1) - #88
Merged
Merged
Conversation
83 builds past b10582. One binding edit: upstream replaced nlohmann::ordered_json with its pimpl wrapper common_json in json-schema-to-grammar.h/chat.h, so json_schema_to_grammar_nif parses with common_json::parse and the direct <nlohmann/json.hpp> include is gone. llama.h changes are additive (llama_tensor_read_lazy, session/state-seq version bumps); every common_speculative_* callsite is signature-identical. Verified on Metal: default 428 passed / 149 excluded, and --include mtp_sidecar 434 passed (Qwen3.8-27B-Q4_K_M + mtp-*-Q4_0).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Bumps vendored llama.cpp b10582 (
e85caa81e) → b10665 (ca3d5a3e1), 83 builds. Submodule andLLAMA_COMMITin the Makefilemove together, per docs/release-guide.md.
Binding changes
One real API break: upstream replaced
nlohmann::ordered_jsonwith its own pimpl wrappercommon_json(common/json.h) acrosscommon/chat.handcommon/json-schema-to-grammar.h.json_schema_to_grammar_nifnow parses withcommon_json::parse; the direct<nlohmann/json.hpp>include is gone.(recursive-descent stack-overflow guard) are unchanged.
Everything else in the range is additive, no NIF edits needed:
include/llama.h: newllama_tensor_read_lazyfield inllama_model_params— the NIF builds params fromllama_model_default_params(), unaffected. Session/state-seq versions bump 9→10 / 2→3.common/speculative.h: only gained functions (common_speculative_n_max, synthetic-acceptance helpers); everycommon_speculative_*callsite is signature-identical.Verification
macOS (Metal, M1 Max), rebuilt with
LLAMA_BACKEND=metal:--include mtp_sidecar(Qwen3.8-27B-Q4_K_M + mtp-Qwen3.8-27B-Q4_0 sidecar head)mix compile --warnings-as-errorsandmix format --check-formattedclean.