mirror of
https://github.com/mudler/LocalAI.git
synced 2026-09-17 18:22:50 -04:00
chore: ⬆️ Update ggml-org/llama.cpp to f280b26983ad0fdb705a0d9ebf0503e76f2899b0 (#11646)
* ⬆️ Update ggml-org/llama.cpp Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix(llama-cpp): adapt to the common JSON API The llama.cpp bump replaces its nlohmann JSON alias with common_json. Update the gRPC adapter for the new exception, iterator, conversion, and container APIs. Assisted-by: Codex:gpt-5.6 [systematic-debugging] * fix(turboquant): adapt the JSON exception type The shared gRPC source now follows the upstream common_json API. The TurboQuant fork still exposes nlohmann JSON and cannot compile the new exception type. Translate that exception in the fork-specific source patch so both llama.cpp variants compile from the shared adapter. Assisted-by: Codex:gpt-5.6 [systematic-debugging] * fix(bonsai): adapt the JSON exception type The shared gRPC source uses upstream's common_json wrapper. The Bonsai fork still exposes nlohmann JSON and cannot compile that exception type.\n\nTranslate the exception in the fork-specific preparation step and verify that repeated preparation stays idempotent.\n\nAssisted-by: Codex:gpt-5.6 [systematic-debugging] * fix(llama-cpp): let prepare register gRPC The score patch duplicated the gRPC CMake registration that prepare.sh already owns. Its stale context rejects the current upstream tools file on Darwin before compilation starts. Assisted-by: Codex:gpt-5 --------- Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: mudler <2420543+mudler@users.noreply.github.com> Co-authored-by: localai-org-maint-bot <306269227+localai-org-maint-bot@users.noreply.github.com>
This commit is contained in:
8 files changed
+97
-44
No files matched your search
@@ -0,0 +1,25 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
|
||||
PATCHER="$ROOT/backend/cpp/bonsai/patch-grpc-server.sh"
|
||||
WORK=$(mktemp -d)
|
||||
trap 'rm -rf "$WORK"' EXIT
|
||||
|
||||
cat > "$WORK/grpc-server.cpp" <<'EOF'
|
||||
try {
|
||||
json::parse("{");
|
||||
} catch (const common_json_error& e) {
|
||||
}
|
||||
EOF
|
||||
|
||||
bash "$PATCHER" "$WORK/grpc-server.cpp"
|
||||
grep -q 'catch (const json::parse_error& e)' "$WORK/grpc-server.cpp"
|
||||
! grep -q 'common_json_error' "$WORK/grpc-server.cpp"
|
||||
|
||||
# A repeated preparation pass must not change the generated source.
|
||||
cp "$WORK/grpc-server.cpp" "$WORK/once.cpp"
|
||||
bash "$PATCHER" "$WORK/grpc-server.cpp"
|
||||
cmp "$WORK/once.cpp" "$WORK/grpc-server.cpp"
|
||||
|
||||
echo "PASS: Bonsai uses its fork-compatible JSON exception"
|
||||
Reference in new issue
Block a user