Skip to content

Upgrade llama.cpp from b12309 to b12316 - #615

Merged
bernardladenthin merged 2 commits into
mainfrom
claude/wonderful-tesla-1fkezz
Nov 12, 2026
Merged

bernardladenthin merged 2 commits into
mainfrom
claude/wonderful-tesla-1fkezz

Conversation

@bernardladenthin

@bernardladenthin bernardladenthin commented Nov 12, 2026 •

Copy link
Copy Markdown
Owner

Summary

  • Pins llama.cpp at b12316 (5d4c8eeb24db049acf74bd6f354bed6eaeffc7dc, a number upstream has not tagged yet; the commit count is the number). Seven upstream commits: per-file download progress throttle and a "stopped": true marker on a download a client stopped (router), model_remove announced over SSE, decomposed flash attention for Adreno in the OpenCL backend, the CUDA MoE kernel skipping empty tiles, and the WebUI's logo and favicons from llama-brand.
  • patches/0006 lost one hunk: upstream's server.cpp includes <mutex> itself now. The other +/- lines are unchanged (6 hunks).
  • The WebUI's lockfile carries the first package npm resolves from a GitHub commit instead of the registry (llama-brand, CC-BY-NC-4.0, with a BRAND-USAGE.md that permits redistribution with software). The license generator reads such a package from GitHub's archive of that commit and refuses a branch name or another host; BRAND-USAGE.md counts as a legal file. Texts regenerated (360 packages), LICENSES/CC-BY-NC-4.0.txt added, the REUSE annotation extended. build-webui rewrites the ssh://git@github.com/ URL to HTTPS before npm ci.
  • New check check_reuse (part of webui-licenses.py check): the REUSE annotation of THIRD-PARTY-LICENSES.txt names every license packages.csv lists, and each has a text in LICENSES/. reuse lint cannot see that.

For the owner to decide: llama-brand is CC BY-NC. Its usage grant covers shipping the marks with software, which is what the WebUI does (only the logo SVGs are imported, not the fonts), but FOSSA may flag the license id.

Test plan

  • C++ suite locally against b12316 with all 20 patches: 780/780
  • check-natives.py, check-patches.py, the buildcheck unit tests (143), reuse lint
  • webui-licenses.py check against the pinned tools/ui; falsified once by removing CC-BY-NC-4.0 from the annotation
  • npm ci --ignore-scripts with the insteadOf rewrite, locally (1087 packages, llama-brand installed)
  • CHANGELOG, TODO, CLAUDE.md, README, NOTICE, the breaking-changes history
  • CI is green on this branch

Not measured: the OpenCL and CUDA changes (no GPU). The license texts of llama-brand were generated from a local clone of the pinned commit rather than from GitHub's archive of it, which the sandbox cannot reach; the CI check compares the lockfile digest and the package list and does not fetch the archive again.

Related issues / PRs

Follows #614.

Checklist

  • I have read CONTRIBUTING.md and CODE_OF_CONDUCT.md
  • No security-sensitive changes

🤖 Generated with Claude Code

https://claude.ai/code/session_01S8cAMZXymmPba3YZr2YCWp

Summary by CodeRabbit

  • New Features
    • Updated the WebUI with refreshed branding and download-status reporting.
    • Added Adreno OpenCL flash-attention kernels and improved CUDA handling of empty MoE tiles.
    • Updated the bundled llama.cpp version to b12316.
  • Bug Fixes
    • Refreshed an embedded-server patch to better support server lifecycle controls.
  • Documentation
    • Updated release history and version references for the latest llama.cpp changes.

Seven upstream commits, pinned by commit (5d4c8eeb, no tag yet).

patches/0006 refreshed: upstream's server.cpp includes <mutex> itself now
(#31467), so the hunk that added it is gone; the other lines are unchanged.

The embedded WebUI takes its logo and favicons from upstream's llama-brand
package (#32039), which npm resolves from a GitHub commit and which is
CC BY-NC 4.0 with a BRAND-USAGE.md that permits redistribution with
software. The license generator read registry tarballs only; it now reads
GitHub's archive of the commit and takes BRAND-USAGE.md as a legal file.
Texts regenerated (360 packages), NOTICE and REUSE name the license, and
the WebUI build maps the lockfile's ssh URL to https.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S8cAMZXymmPba3YZr2YCWp
…ependency end to end

The b12316 lockfile brought the first package npm resolves from a GitHub commit
(llama-brand, CC-BY-NC-4.0 with a usage grant). The generator's new path was
tested only by its URL mapping and its file-name pattern.

- generate() and check() run over a fixture with such a dependency: the archive
  root GitHub names after repository and commit, LICENSE and BRAND-USAGE.md
  taken, README and nested files left out, the lockfile's own URL kept in
  packages.csv, and a lockfile that gains the dependency reported twice (digest
  and missing package).
- check_reuse: REUSE.toml's annotation of THIRD-PARTY-LICENSES.txt names every
  license of packages.csv, and each has a text in LICENSES/. reuse lint holds
  the annotation to the folder only, not to what the file contains. Part of
  webui-licenses.py check, and a unit test runs it on the committed texts.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S8cAMZXymmPba3YZr2YCWp
@coderabbitai

coderabbitai Bot commented Nov 12, 2026 •

Copy link
Copy Markdown

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

The llama.cpp pin advances from b12309 to b12316, and patch 0006 is refreshed. WebUI license tooling now supports dependencies pinned to GitHub commits and validates REUSE annotations and license text files. The WebUI license inventory adds llama-brand and CC-BY-NC-4.0.

Changes: Upstream update and WebUI licensing

Layer / File(s) Summary
Update the llama.cpp pin and embedded-server patch
llama/CMakeLists.txt, llama/patches/0006-server-embed-native-server-jni.patch, llama/src/main/java/net/ladenthin/llama/value/LlamaCppVersion.java, llama/legal/natives/NOTICE.md, README.md, CLAUDE.md, docs/patches.md, CHANGELOG.md, docs/history/llama-cpp-breaking-changes.md
The pin changes from b12309 to b12316. Patch 0006 removes two hunks and updates shutdown-handler and signal-handler behavior. Version references and patch notes are updated.
Support GitHub archives and check REUSE metadata
.github/buildcheck/webuilicenses.py, .github/buildcheck/tests/test_webuilicenses.py, .github/webui-licenses.py, .github/workflows/publish.yml, CLAUDE.md
The license generator resolves pinned GitHub commits to codeload archives and recognizes root-level brand-usage files. The check command combines license checks with REUSE annotation and license-text validation. Tests cover generation, stale output, and invalid URLs. The WebUI build rewrites GitHub SSH URLs to HTTPS.
Refresh the bundled WebUI license inventory
REUSE.toml, LICENSES/CC-BY-NC-4.0.txt, llama/legal/natives/NOTICE.md, llama/legal/natives/webui-npm/THIRD-PARTY-LICENSES.txt, llama/legal/natives/webui-npm/LOCKFILE.sha256, TODO.md
The WebUI bundle records llama-brand and its CC-BY-NC-4.0 terms. The REUSE annotation, license text, package count, lockfile revision, and checksum are updated.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Change: Other

Sequence Diagram(s)

sequenceDiagram
  participant WebuiLicenses as .github/webui-licenses.py
  participant check
  participant check_reuse
  participant REUSEtoml as REUSE.toml
  participant packagescsv as packages.csv
  participant LICENSES as LICENSES/
  WebuiLicenses->>check: check(args.ui, args.out)
  WebuiLicenses->>check_reuse: check_reuse(args.out)
  check_reuse->>REUSEtoml: parse annotation for THIRD-PARTY-LICENSES.txt
  check_reuse->>packagescsv: read SPDX license IDs
  check_reuse->>LICENSES: verify license text files
  check_reuse-->>WebuiLicenses: return validation problems
Loading

Possibly related PRs

Suggested labels: dependencies

Suggested reviewers: claude

Merge Risk: Minimal · up to 83356

This updates the bundled llama.cpp version and WebUI license tooling. No concrete merge-blocking issue was identified. Native builds, GPU behavior and the real GitHub archive were not validated, which is normal pre-merge uncertainty.

Pre-merge checks: Passed 4

Check name Status Explanation
Title check Passed The title "Upgrade llama.cpp from b12309 to b12316" matches the main change. The PR bumps the pinned llama.cpp version across CMake, the Java constant, the docs, and the NOTICE and license files. The …
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Full details: Title check

Explanation

The title "Upgrade llama.cpp from b12309 to b12316" matches the main change. The PR bumps the pinned llama.cpp version across CMake, the Java constant, the docs, and the NOTICE and license files. The title does not mention the WebUI license-generator work, the patch 0006 refresh, or the new CC-BY-NC-4.0 license. Those are secondary changes, so the title is specific and accurate for the primary change.

Finishing Touches

Generate unit tests (beta)

  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Warning

Some tools did not complete. Review the errors below.

LanguageTool

LanguageTool checks are incomplete because the process-local organization character budget was exhausted. Remaining chunks and files were skipped; findings from completed checks are retained.

docs/history/llama-cpp-breaking-changes.md

LanguageTool checks are incomplete because the per-file request limit of 5 was reached. Remaining text was skipped; findings from completed checks are retained.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

Recent review info

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: b083b841-cbb4-4c01-93d9-2bf24a4b146f
Commits

Reviewing files that changed from the base of the PR and between 6ce3389 and 833569e.

Files ignored due to path filters: 1

  • llama/legal/natives/webui-npm/packages.csv is excluded by !**/*.csv
Files selected for processing: 18

  • .github/buildcheck/tests/test_webuilicenses.py
  • .github/buildcheck/webuilicenses.py
  • .github/webui-licenses.py
  • .github/workflows/publish.yml
  • CHANGELOG.md
  • CLAUDE.md
  • LICENSES/CC-BY-NC-4.0.txt
  • README.md
  • REUSE.toml
  • TODO.md
  • docs/history/llama-cpp-breaking-changes.md
  • docs/patches.md
  • llama/CMakeLists.txt
  • llama/legal/natives/NOTICE.md
  • llama/legal/natives/webui-npm/LOCKFILE.sha256
  • llama/legal/natives/webui-npm/THIRD-PARTY-LICENSES.txt
  • llama/patches/0006-server-embed-native-server-jni.patch
  • llama/src/main/java/net/ladenthin/llama/value/LlamaCppVersion.java

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

Copy link
Copy Markdown
Owner Author

claude-review is red with Claude execution failed: result is_error:true after 13 seconds, before it read any of the diff. The same job failed the same way on #612, #613 and #614, so it is not this PR's; it needs the workflow's own setup looked at, not a change here.


Generated by Claude Code

Copy link
Copy Markdown
Owner Author

FOSSA "License Compliance" reports 25 issues. 24 of them are on main already (the same status on #613 and #614). The one more is new with this PR; I cannot open the FOSSA report from here, so this is an inference, not a reading: the only license this PR adds is llama-brand's CC-BY-NC-4.0 (the WebUI's logo and favicons since upstream #32039).

That one is not fixable by a change here. Upstream's WebUI imports the logo from that package, and its BRAND-USAGE.md (shipped in THIRD-PARTY-LICENSES.txt next to the license) permits redistributing the marks with software. Whether to accept that in FOSSA, or to build the WebUI without the brand assets, is the owner's decision.


Generated by Claude Code

@sonarqubecloud

Copy link
Copy Markdown

@bernardladenthin
bernardladenthin merged commit 4e2f388 into main Nov 12, 2026
31 of 60 checks passed
@bernardladenthin
bernardladenthin deleted the claude/wonderful-tesla-1fkezz branch November 12, 2026 06:35

This branch was successfully deployed

1 active deployment
startgate — 833569e1 Deployed Nov 12, 2026 by bernardladenthin via Start gate (abort window) #1500
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