diff --git a/Cargo.lock b/Cargo.lock index 55397f1f2..c35d42e34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1163,7 +1163,7 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "llama-cpp-bindings" -version = "0.11.0" +version = "0.12.0" dependencies = [ "encoding_rs", "enumflags2", @@ -1182,7 +1182,7 @@ dependencies = [ [[package]] name = "llama-cpp-bindings-build" -version = "0.11.0" +version = "0.12.0" dependencies = [ "bindgen", "cc", @@ -1195,14 +1195,14 @@ dependencies = [ [[package]] name = "llama-cpp-bindings-sys" -version = "0.11.0" +version = "0.12.0" dependencies = [ "llama-cpp-bindings-build", ] [[package]] name = "llama-cpp-bindings-tests" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "encoding_rs", @@ -1214,7 +1214,7 @@ dependencies = [ [[package]] name = "llama-cpp-bindings-types" -version = "0.11.0" +version = "0.12.0" dependencies = [ "serde", "serde_json", @@ -1223,11 +1223,11 @@ dependencies = [ [[package]] name = "llama-cpp-error-recorder" -version = "0.11.0" +version = "0.12.0" [[package]] name = "llama-cpp-gbnf" -version = "0.11.0" +version = "0.12.0" dependencies = [ "llama-cpp-bindings-sys", "thiserror", @@ -1235,11 +1235,11 @@ dependencies = [ [[package]] name = "llama-cpp-log-decoder" -version = "0.11.0" +version = "0.12.0" [[package]] name = "llama-cpp-test-harness" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "hf-hub", @@ -1252,7 +1252,7 @@ dependencies = [ [[package]] name = "llama-cpp-test-harness-macros" -version = "0.11.0" +version = "0.12.0" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 7e3e3af30..45335b3a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ [workspace.package] edition = "2024" -version = "0.11.0" +version = "0.12.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.11.0" } -llama-cpp-bindings-build = { path = "llama-cpp-bindings-build", version = "=0.11.0" } -llama-cpp-bindings-sys = { path = "llama-cpp-bindings-sys", version = "=0.11.0" } -llama-cpp-bindings-types = { path = "llama-cpp-bindings-types", version = "=0.11.0" } -llama-cpp-error-recorder = { path = "llama-cpp-error-recorder", version = "=0.11.0" } -llama-cpp-gbnf = { path = "llama-cpp-gbnf", version = "=0.11.0" } -llama-cpp-log-decoder = { path = "llama-cpp-log-decoder", version = "=0.11.0" } -llama-cpp-test-harness = { path = "llama-cpp-test-harness", version = "=0.11.0" } -llama-cpp-test-harness-macros = { path = "llama-cpp-test-harness-macros", version = "=0.11.0" } +llama-cpp-bindings = { path = "llama-cpp-bindings", version = "=0.12.0" } +llama-cpp-bindings-build = { path = "llama-cpp-bindings-build", version = "=0.12.0" } +llama-cpp-bindings-sys = { path = "llama-cpp-bindings-sys", version = "=0.12.0" } +llama-cpp-bindings-types = { path = "llama-cpp-bindings-types", version = "=0.12.0" } +llama-cpp-error-recorder = { path = "llama-cpp-error-recorder", version = "=0.12.0" } +llama-cpp-gbnf = { path = "llama-cpp-gbnf", version = "=0.12.0" } +llama-cpp-log-decoder = { path = "llama-cpp-log-decoder", version = "=0.12.0" } +llama-cpp-test-harness = { path = "llama-cpp-test-harness", version = "=0.12.0" } +llama-cpp-test-harness-macros = { path = "llama-cpp-test-harness-macros", version = "=0.12.0" } llguidance = "=1.7.0" log = "=0.4.29" nom = "=8.0.0" diff --git a/llama-cpp-bindings-build/src/lib.rs b/llama-cpp-bindings-build/src/lib.rs index 488092446..a8645dfdf 100644 --- a/llama-cpp-bindings-build/src/lib.rs +++ b/llama-cpp-bindings-build/src/lib.rs @@ -112,22 +112,11 @@ fn cargo_target_dir(out_dir: &Path) -> PathBuf { .to_path_buf() } -fn set_cmake_parallelism() { - if let Ok(parallelism) = std::thread::available_parallelism() { - // SAFETY: build scripts are single-threaded, so modifying env is safe. - unsafe { - env::set_var("CMAKE_BUILD_PARALLEL_LEVEL", parallelism.get().to_string()); - } - } -} - pub fn build() { let context = BuildContext::detect(); rebuild_tracking::register_rebuild_triggers(&context.llama_src); - set_cmake_parallelism(); - bindgen_config::generate_bindings( &context.llama_src, &context.out_dir,