Skip to content

Bump llama.cpp to b11612 and prepare for patch 0012 drop - #536

Merged
bernardladenthin merged 1 commit into
mainfrom
claude/tender-brown-6w4vq8
Oct 14, 2026
Merged

bernardladenthin merged 1 commit into
mainfrom
claude/tender-brown-6w4vq8

Conversation

@bernardladenthin

Copy link
Copy Markdown
Owner

Summary

  • Upgrade llama.cpp pin from b11574 to b11612
  • Add comprehensive documentation for dropping patch 0012 at the next bump past b11612, where upstream merged the fix independently (model: fix "invalid vector subscript" when loading on a full GPU ggml-org/llama.cpp#29677)
  • Update patch 0012 header with status and drop instructions
  • Add test case for sink precedence over common_log_set_stdo() (b11612 #30023)
  • Refresh patch 0014 hunks to apply cleanly against b11612
  • Update version references throughout (Java, docs, README, CMakeLists.txt)

Test plan

  • Affected unit tests pass locally (test_common_log_callback.cpp new test added)
  • CI is green on this branch
  • Docs updated: TODO.md with detailed drop instructions, patch headers, version badges

Related issues / PRs

Upstream: ggml-org/llama.cpp#29677 (merged 2026-10-14, commit df18bee11)

Checklist

  • I have read CONTRIBUTING.md and CODE_OF_CONDUCT.md
  • My commits follow Conventional Commits
  • No security-sensitive changes

https://claude.ai/code/session_017kVXQfPe1ACLAuk29Y4d2H

One step over 38 upstream commits; the bulk of the 6.4 MB diff is data
(docs/ops/zDNN.csv, the NFC tables of src/unicode-data.cpp, the
consolidated context-state tests). The priority list has one API change,
common_chat_params::prompt as common_chat_prompt parts (#30389), which
nothing here reads. No project source change.

Patches: 0001 loses its tests/test-state-restore-fragmented.cpp hunk
(the file went with #30023), 0014 is regenerated around upstream's new
common_log_set_stdo() with the sink keeping precedence over the console
switch (pinned by a new test case), the other eleven apply unchanged.
check-patches.py 13/101/0, ctest 608/608, the model-free native Java
tests 27/27 over the b11612 library.

Patch 0012 stays: upstream merged the same even-split fallback as
ggml-org/llama.cpp#29677 (df18bee11) on 2026-10-14, but 15 commits past
b11612, so the pin still carries the bare division. The patch header,
its CLAUDE.md row, test_model_split.cpp and a new TODO.md section record
the fix with its link and the rule for the bump that crosses it: drop
0012 instead of refreshing it, and replace the guard, which links the two
functions only the patch provides, by a test over upstream's own load
path rather than keeping a residue of the patch for it.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017kVXQfPe1ACLAuk29Y4d2H
@bernardladenthin
bernardladenthin merged commit 31cb286 into main Oct 14, 2026
9 of 14 checks passed
@bernardladenthin
bernardladenthin deleted the claude/tender-brown-6w4vq8 branch October 14, 2026 10:32
@sonarqubecloud

Copy link
Copy Markdown

This branch had an error being deployed

1 failed deployment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants