From 87d644718698804fc80856fe477b7359681de050 Mon Sep 17 00:00:00 2001 From: Mateusz Charytoniuk Date: Fri, 3 Jul 2026 15:55:09 +0200 Subject: [PATCH] Bump workspace to 0.10.0 and package the vendored GSL headers --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 20 ++++++++++---------- llama-cpp-bindings-sys/Cargo.toml | 5 +++-- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d71f56ae..e0eaa2da9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1163,7 +1163,7 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "llama-cpp-bindings" -version = "0.9.0" +version = "0.10.0" dependencies = [ "encoding_rs", "enumflags2", @@ -1182,7 +1182,7 @@ dependencies = [ [[package]] name = "llama-cpp-bindings-build" -version = "0.9.0" +version = "0.10.0" dependencies = [ "bindgen", "cc", @@ -1195,14 +1195,14 @@ dependencies = [ [[package]] name = "llama-cpp-bindings-sys" -version = "0.9.0" +version = "0.10.0" dependencies = [ "llama-cpp-bindings-build", ] [[package]] name = "llama-cpp-bindings-tests" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "encoding_rs", @@ -1214,7 +1214,7 @@ dependencies = [ [[package]] name = "llama-cpp-bindings-types" -version = "0.9.0" +version = "0.10.0" dependencies = [ "serde", "serde_json", @@ -1223,11 +1223,11 @@ dependencies = [ [[package]] name = "llama-cpp-error-recorder" -version = "0.9.0" +version = "0.10.0" [[package]] name = "llama-cpp-gbnf" -version = "0.9.0" +version = "0.10.0" dependencies = [ "llama-cpp-bindings-sys", "thiserror", @@ -1235,11 +1235,11 @@ dependencies = [ [[package]] name = "llama-cpp-log-decoder" -version = "0.9.0" +version = "0.10.0" [[package]] name = "llama-cpp-test-harness" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "hf-hub", @@ -1252,7 +1252,7 @@ dependencies = [ [[package]] name = "llama-cpp-test-harness-macros" -version = "0.9.0" +version = "0.10.0" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 27fa713ec..cdb7c2a47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ [workspace.package] edition = "2024" -version = "0.9.0" +version = "0.10.0" license = "Apache-2.0" repository = "https://github.com/intentee/llama-cpp-bindings" @@ -31,15 +31,15 @@ glob = "=0.3.3" hf-hub = "=0.5.0" inventory = "=0.3.24" libtest-mimic = "=0.8.2" -llama-cpp-bindings = { path = "llama-cpp-bindings", version = "=0.9.0" } -llama-cpp-bindings-build = { path = "llama-cpp-bindings-build", version = "=0.9.0" } -llama-cpp-bindings-sys = { path = "llama-cpp-bindings-sys", version = "=0.9.0" } -llama-cpp-bindings-types = { path = "llama-cpp-bindings-types", version = "=0.9.0" } -llama-cpp-error-recorder = { path = "llama-cpp-error-recorder", version = "=0.9.0" } -llama-cpp-gbnf = { path = "llama-cpp-gbnf", version = "=0.9.0" } -llama-cpp-log-decoder = { path = "llama-cpp-log-decoder", version = "=0.9.0" } -llama-cpp-test-harness = { path = "llama-cpp-test-harness", version = "=0.9.0" } -llama-cpp-test-harness-macros = { path = "llama-cpp-test-harness-macros", version = "=0.9.0" } +llama-cpp-bindings = { path = "llama-cpp-bindings", version = "=0.10.0" } +llama-cpp-bindings-build = { path = "llama-cpp-bindings-build", version = "=0.10.0" } +llama-cpp-bindings-sys = { path = "llama-cpp-bindings-sys", version = "=0.10.0" } +llama-cpp-bindings-types = { path = "llama-cpp-bindings-types", version = "=0.10.0" } +llama-cpp-error-recorder = { path = "llama-cpp-error-recorder", version = "=0.10.0" } +llama-cpp-gbnf = { path = "llama-cpp-gbnf", version = "=0.10.0" } +llama-cpp-log-decoder = { path = "llama-cpp-log-decoder", version = "=0.10.0" } +llama-cpp-test-harness = { path = "llama-cpp-test-harness", version = "=0.10.0" } +llama-cpp-test-harness-macros = { path = "llama-cpp-test-harness-macros", version = "=0.10.0" } llguidance = "=1.7.0" log = "=0.4.29" nom = "=8.0.0" diff --git a/llama-cpp-bindings-sys/Cargo.toml b/llama-cpp-bindings-sys/Cargo.toml index 8546682f3..352130a58 100644 --- a/llama-cpp-bindings-sys/Cargo.toml +++ b/llama-cpp-bindings-sys/Cargo.toml @@ -10,11 +10,12 @@ links = "llama" include = [ "wrapper*.h", "wrapper_*.cpp", - "marker_probes/**/*.h", - "marker_probes/**/*.cpp", "build.rs", "/src", + "/GSL/include/**/*", + "/GSL/LICENSE", + "/llama.cpp/common/**/*.h", "/llama.cpp/common/**/*.hpp", "/llama.cpp/common/**/*.cpp",