Upgrade llama.cpp from b9975 to b9982 and drop merged patches#339
Merged
Conversation
Drop patch 0005 (recurrent near-prompt-end checkpoints): upstream's own server-context.cpp create_checkpoint/do_checkpoint now solve the same checkpoint-starvation problem with a strict superset fix (id_task-tracked eviction + an unconditional near_prompt_end min-step exemption, vs our patch's recurrent/hybrid-only scoping), so 0005 no longer applies and is redundant. Verified via a fresh fail-loud cmake configure against b9981 with the remaining seven patches (0001-0004, 0006-0008) applying cleanly.
Update the b9975-b9981 verification row with the real cmake --build + ctest results now that the full native build finished cleanly.
Drop patch 0004 (PR#23116 carry): upstream merged it verbatim in this release — server-common.cpp's oaicompat_chat_params_parse gets the same reasoning_budget_tokens/reasoning_budget_message per-request precedence change, plus the same two tests/test-chat.cpp regression cases, so the local patch is now redundant. A fresh native build + full ctest run is in progress to confirm the remaining patches still apply and compile cleanly against b9982; results will follow in a subsequent commit.
bernardladenthin
had a problem deploying
to
maven-central
July 13, 2026 07:23 — with
GitHub Actions
Failure
bernardladenthin
had a problem deploying
to
startgate
July 13, 2026 07:23 — with
GitHub Actions
Error
bernardladenthin
had a problem deploying
to
maven-central
July 13, 2026 07:23 — with
GitHub Actions
Failure
|
bernardladenthin
pushed a commit
that referenced
this pull request
Jul 13, 2026
…ry rows Additive-only bump (SYCL backend internals + auto-followed WebUI only, no patch-target file touched); all six remaining patches apply unchanged. Full native build + ctest: 485/485 passing. Also recovers the b9981-b9982 history-doc rows from orphaned commit 6eacc95, which never made it into main - PR #339 appears to have been merged at an earlier commit on that branch before the follow-up commit landed.
5 tasks
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
0004-pr23116-server-per-request-reasoning-budget-tokens.patch(merged in upstream PR #23116)0005-server-recurrent-near-prompt-end-checkpoints.patch(merged upstream)CLAUDE.mdto reflect the removal and current patch statusTest plan
CLAUDE.md,README.md,LlamaCppVersion.java,CMakeLists.txt, and breaking-changes history)Related issues / PRs
Upstream merges:
Checklist
CONTRIBUTING.mdandCODE_OF_CONDUCT.mdhttps://claude.ai/code/session_01KYQqYWhZefKd5mus7FGM9W