Merge branch 'master' into chore/ubuntu-24.04
Some checks failed
Security Scan / tests (push) Has been cancelled

This commit is contained in:
Ettore Di Giacinto 2025-06-02 09:13:26 +02:00 committed by GitHub
commit 808286c596
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View file

@ -6,11 +6,11 @@ BINARY_NAME=local-ai
DETECT_LIBS?=true
# llama.cpp versions
CPPLLAMA_VERSION?=e83ba3e460651b20a594e9f2f0f0bffb998d3ce1
CPPLLAMA_VERSION?=e562eece7cb476276bfc4cbb18deb7c0369b2233
# whisper.cpp version
WHISPER_REPO?=https://github.com/ggml-org/whisper.cpp
WHISPER_CPP_VERSION?=98dfe8dc264b7d0d1daccfff9a9c043bcc2ece4b
WHISPER_CPP_VERSION?=7fd6fa809749078aa00edf945e959c898f2bd1af
# go-piper version
PIPER_REPO?=https://github.com/mudler/go-piper

View file

@ -11,9 +11,9 @@ set -e
cp -r CMakeLists.txt llama.cpp/tools/grpc-server/
cp -r grpc-server.cpp llama.cpp/tools/grpc-server/
cp -rfv llama.cpp/common/json.hpp llama.cpp/tools/grpc-server/
cp -rfv llama.cpp/vendor/nlohmann/json.hpp llama.cpp/tools/grpc-server/
cp -rfv llama.cpp/tools/server/utils.hpp llama.cpp/tools/grpc-server/
cp -rfv llama.cpp/tools/server/httplib.h llama.cpp/tools/grpc-server/
cp -rfv llama.cpp/vendor/cpp-httplib/httplib.h llama.cpp/tools/grpc-server/
set +e
if grep -q "grpc-server" llama.cpp/tools/CMakeLists.txt; then