Repository navigation
Upgrade llama.cpp from b12309 to b12316 - #615
Conversation
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
|
No actionable comments were generated in the recent review. Walkthrough
Merge Risk:
|
|
Generated by Claude Code |
|
FOSSA "License Compliance" reports 25 issues. 24 of them are on That one is not fixable by a change here. Upstream's WebUI imports the logo from that package, and its Generated by Claude Code |
|



Summary
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": truemarker on a download a client stopped (router),model_removeannounced 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 fromllama-brand.patches/0006lost one hunk: upstream'sserver.cppincludes<mutex>itself now. The other+/-lines are unchanged (6 hunks).llama-brand, CC-BY-NC-4.0, with aBRAND-USAGE.mdthat 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.mdcounts as a legal file. Texts regenerated (360 packages),LICENSES/CC-BY-NC-4.0.txtadded, the REUSE annotation extended.build-webuirewrites thessh://git@github.com/URL to HTTPS beforenpm ci.check_reuse(part ofwebui-licenses.py check): the REUSE annotation ofTHIRD-PARTY-LICENSES.txtnames every licensepackages.csvlists, and each has a text inLICENSES/.reuse lintcannot see that.For the owner to decide:
llama-brandis 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
check-natives.py,check-patches.py, the buildcheck unit tests (143),reuse lintwebui-licenses.py checkagainst the pinnedtools/ui; falsified once by removingCC-BY-NC-4.0from the annotationnpm ci --ignore-scriptswith theinsteadOfrewrite, locally (1087 packages,llama-brandinstalled)Not measured: the OpenCL and CUDA changes (no GPU). The license texts of
llama-brandwere 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
CONTRIBUTING.mdandCODE_OF_CONDUCT.md🤖 Generated with Claude Code
https://claude.ai/code/session_01S8cAMZXymmPba3YZr2YCWp
Summary by CodeRabbit