Skip to content

Upgrade llama.cpp from b11214 to b11222 - #460

Merged
bernardladenthin merged 1 commit into
mainfrom
claude/busy-archimedes-lo9uyy
Sep 27, 2026
Merged

bernardladenthin merged 1 commit into
mainfrom
claude/busy-archimedes-lo9uyy

Conversation

@bernardladenthin

Copy link
Copy Markdown
Owner

Summary

  • Bumps llama.cpp from b11214 to b11222 (eight upstream commits). The pin is updated in llama/CMakeLists.txt, the README badge, CLAUDE.md and LlamaCppVersion. CHANGELOG.md and docs/history/llama-cpp-breaking-changes.md get entries.
  • Patches 0001 and 0006 refreshed, content unchanged. Upstream #29537 moved SRV_INF("initializing ...") below the common_params_parse call in llama_server(). That line was the context of both patches' parse-call hunk. The hunks now anchor on the preceding server_stream_session_manager_start() lines. All eight patches apply in order on pristine b11222.
  • Drop-check for 0001: still required. b11222:common/arg.h has no common_params_parse_main, and the _WIN32 argv = utf8.ptrs.data() override is still in common/arg.cpp.
  • No project source change.
    • #29518: string_split<T> now throws on a token it cannot parse. The only numeric callers are the benchmark options -npp/-ntg/-npl.
    • #29537: --rpc is now always registered and errors out in builds without RPC. This project builds with GGML_RPC=OFF, and --rpc is not in ModelOption.
    • The rest (CUDA/SYCL/OpenCL kernels, the Jinja dict builtin, conversion scripts, upstream CI) arrives automatically.
  • Upstream's release.yml is unchanged, so the CUDA/ROCm/OpenVINO pins stay.

Test plan

  • All eight patches git apply in filename order on pristine b11222
  • CI is green on this branch (no local build — left to CI)
  • Docs / CHANGELOG updated where applicable

Related issues / PRs

Follows #458 (b11211 → b11214).

Checklist

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

🤖 Generated with Claude Code

https://claude.ai/code/session_01QSXAwbXqx9u5xsMArMvgT8


Generated by Claude Code

Eight upstream commits. #29537 moved the "initializing ..." log in
llama_server() below the common_params_parse call, which is the context of
the parse-call hunk in patches 0001 and 0006; both hunks were re-anchored,
content unchanged, and all eight patches apply in order on b11222. 0001 is
still required (no common_params_parse_main upstream, the _WIN32 argv
override is still there).

No project source change: #29518 (string_split<T> throws on an unparsable
element) only affects the numeric benchmark options, and #29537's
always-registered --rpc is not used by ModelOption. No release.yml change
upstream, so the CUDA/ROCm/OpenVINO pins stay.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QSXAwbXqx9u5xsMArMvgT8
@sonarqubecloud

Copy link
Copy Markdown

@bernardladenthin
bernardladenthin merged commit f266ad4 into main Sep 27, 2026
12 of 17 checks passed
@bernardladenthin
bernardladenthin deleted the claude/busy-archimedes-lo9uyy branch September 27, 2026 19:01

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