Upgrade llama.cpp from b9682 to b9739#247
Merged
Merged
Conversation
Breaking changes fixed: - server-schema.cpp added to CMakeLists.txt target_sources (new upstream file extracted from server-task.cpp; server-context.cpp now depends on it) - #include "server-schema.h" added to jllama.cpp and test_server.cpp - server_task::params_from_json_cmpl() → server_schema::eval_llama_cmpl_schema() in jllama.cpp:populate_completion_task and test_server.cpp:parse_params Non-breaking upstream changes absorbed automatically: - common_params_model::name → get_name() (not referenced in project C++) - webui/webui_mcp_proxy/webui_config_json fields removed from common_params - server_state enum: SERVER_STATE_LOADING_MODEL→LOADING, new SLEEPING value - on_sleeping_changed → set_state_callback / server_state_callback_t - cpp-httplib vendor bump v0.47.0 → v0.48.0 New upstream features (available for future Java API exposure): - common_speculative_get_state/set_state: Eagle3 checkpoint save/restore - common_download_remove: cached model deletion - --agent flag: all tools + MCP CORS proxy in one step - API key file #-comment support (auto-applied for existing setApiKeyFile users) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XjHW4CFNEcj4sB8KksJ4LB
|
bernardladenthin
pushed a commit
that referenced
this pull request
Jun 20, 2026
…fix) The b9739 upgrade (#247) added tools/server/server-schema.cpp to the jllama library target but not to the jllama_test executable target. server-schema.cpp defines server_schema::eval_llama_cmpl_schema(), which test_server.cpp and the upstream server-context.cpp reference, so the test link failed with an undefined/unresolved external symbol on every platform that builds the tests (Linux x86_64, macOS, Windows MSVC, Windows Ninja). The shared library itself links fine — only jllama_test was missing the TU. Add server-schema.cpp to the jllama_test source list, mirroring its presence in the library target. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SfvSZ76NW4e1qX1PjL4RKq
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
server-schema.cppto build sourcesserver_task::params_from_json_cmpl()toserver_schema::eval_llama_cmpl_schema()following upstream refactoringChanges
Build System
CMakeLists.txtto pin llama.cpp tob9739and include the newserver-schema.cppsource file in the jllama targetSource Code
#include "server-schema.h"tojllama.cppandtest_server.cppserver_task::params_from_json_cmpl()toserver_schema::eval_llama_cmpl_schema()in:src/main/cpp/jllama.cpp:203src/test/cpp/test_server.cpp:1722jni_helpers.hppto reference the new function nameDocumentation
server_task::params_from_json_cmpl()moved toserver_schema::eval_llama_cmpl_schema()common_params_model::name, deprecated webui config fieldsSERVER_STATE_LOADING_MODEL→SERVER_STATE_LOADINGeval_llama_cmpl_schemainstead ofparams_from_json_cmplTest plan
test_server.cppparameter parsing tests)Related issues / PRs
Upstream llama.cpp release: https://github.com/ggml-org/llama.cpp/releases/tag/b9739
Checklist
CONTRIBUTING.mdandCODE_OF_CONDUCT.mdhttps://claude.ai/code/session_01XjHW4CFNEcj4sB8KksJ4LB