Merge branch 'main' into dependabot/cargo/anyhow-1.0.100

MarcusDunn · web-flow · commit ea0fcd45f2a1 · 2025-10-15T12:29:18.000-07:00
diff --git a/.github/workflows/llama-cpp-rs-check.yml b/.github/workflows/llama-cpp-rs-check.yml
@@ -35,10 +35,8 @@ jobs:
         run: cargo fmt --check
       - name: Test
         run: cargo test --features sampler
-      - name: Dry-Run Publishing llama-cpp-sys-2 Crate
-        run: RUST_BACKTRACE=1 cargo publish --package llama-cpp-sys-2 --verbose --dry-run
-      - name: Dry-Run Publishing llama-cpp-2 Crate
-        run: RUST_BACKTRACE=1 cargo publish --package llama-cpp-2 --verbose --dry-run
+      - name: Dry-Run Publishing
+        run: RUST_BACKTRACE=1 cargo publish --workspace --verbose --dry-run
   arm64:
     name: Check that it builds on various targets
     runs-on: ubuntu-latest
@@ -85,4 +83,4 @@ jobs:
       - name: Build
         run: cargo build --features sampler
       - name: Test
-        run: cargo test --features sampler
+        run: cargo test --features sampler
diff --git a/.github/workflows/publish-upon-release.yml b/.github/workflows/publish-upon-release.yml
@@ -18,10 +18,7 @@ jobs:
         with:
           submodules: recursive
       - name: Publish crates for llama-cpp-sys-2
-        run: RUST_BACKTRACE=1 cargo publish --package llama-cpp-sys-2 --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --verbose 
-      - name: Publish crates for llama-cpp-2
-        run: RUST_BACKTRACE=1 cargo publish --package llama-cpp-2 --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --verbose 
-        
+        run: RUST_BACKTRACE=1 cargo publish --workspace --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --verbose
       # Trigger the 'update-toml-version' workflow
       - name: Dispatch Update TOML Version Event
         if: success()  # Ensure this runs only if the previous steps were successful
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,9 +20,9 @@ hf-hub = { version = "0.3.2" }
 criterion = "0.5.1"
 pprof = "0.13.0"
 bindgen = "0.72.1"
-cc = "1.2.37"
+cc = "1.2.38"
 anyhow = "1.0.100"
-clap = "4.5.47"
+clap = "4.5.48"
 encoding_rs = "0.8.35"
 tracing-subscriber = { version = "0.3", features = ["json"] }
 
diff --git a/examples/embeddings/Cargo.toml b/examples/embeddings/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "embeddings"
-version = "0.1.122"
+version = "0.1.123"
 edition = "2021"
+publish = false
 
 [dependencies]
 llama-cpp-2 = { path = "../../llama-cpp-2", version = "0.1.69" }
diff --git a/examples/mtmd/Cargo.toml b/examples/mtmd/Cargo.toml
@@ -2,6 +2,7 @@
 name = "mtmd"
 version = "0.1.86"
 edition = "2021"
+publish = false
 
 [dependencies]
 llama-cpp-2 = { path = "../../llama-cpp-2", version = "0.1.86", features = ["mtmd"] }
diff --git a/examples/reranker/Cargo.toml b/examples/reranker/Cargo.toml
@@ -2,6 +2,7 @@
 name = "reranker"
 version = "0.1.86"
 edition = "2021"
+publish = false
 
 [dependencies]
 llama-cpp-2 = { path = "../../llama-cpp-2", version = "0.1.86" }
@@ -17,4 +18,4 @@ native = ["llama-cpp-2/native"]
 vulkan = ["llama-cpp-2/vulkan"]
 
 [lints]
-workspace = true
+workspace = true
diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "simple"
-version = "0.1.122"
+version = "0.1.123"
 edition = "2021"
+publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/llama-cpp-2/Cargo.toml b/llama-cpp-2/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "llama-cpp-2"
 description = "llama.cpp bindings for Rust"
-version = "0.1.122"
+version = "0.1.123"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/utilityai/llama-cpp-rs"
@@ -10,7 +10,7 @@ repository = "https://github.com/utilityai/llama-cpp-rs"
 
 [dependencies]
 enumflags2 = "0.7.12"
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.122" }
+llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.123" }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-core = { workspace = true }
@@ -35,7 +35,7 @@ mtmd = ["llama-cpp-sys-2/mtmd"]
 
 
 [target.'cfg(all(target_os = "macos", any(target_arch = "aarch64", target_arch = "arm64")))'.dependencies]
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.122", features = [
+llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.123", features = [
     "metal",
 ] }
 
diff --git a/llama-cpp-sys-2/Cargo.toml b/llama-cpp-sys-2/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "llama-cpp-sys-2"
 description = "Low Level Bindings to llama.cpp"
-version = "0.1.122"
+version = "0.1.123"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/utilityai/llama-cpp-rs"
diff --git a/llama-cpp-sys-2/build.rs b/llama-cpp-sys-2/build.rs
@@ -420,6 +420,44 @@ fn main() {
         }
     }
 
+    // Fix bindgen header discovery on Windows MSVC
+    // Use cc crate to discover MSVC include paths by compiling a dummy file
+    if matches!(target_os, TargetOs::Windows(WindowsVariant::Msvc)) {
+        // Create a minimal dummy C file to extract compiler flags
+        let out_dir = env::var("OUT_DIR").unwrap();
+        let dummy_c = Path::new(&out_dir).join("dummy.c");
+        std::fs::write(&dummy_c, "int main() { return 0; }").unwrap();
+        
+        // Use cc crate to get compiler with proper environment setup
+        let mut build = cc::Build::new();
+        build.file(&dummy_c);
+        
+        // Get the actual compiler command cc would use
+        let compiler = build.try_get_compiler().unwrap();
+        
+        // Extract include paths by checking compiler's environment
+        // cc crate sets up MSVC environment internally
+        let env_include = compiler.env().iter()
+            .find(|(k, _)| k.eq_ignore_ascii_case("INCLUDE"))
+            .map(|(_, v)| v);
+            
+        if let Some(include_paths) = env_include {
+            for include_path in include_paths.to_string_lossy().split(';').filter(|s| !s.is_empty()) {
+                bindings_builder = bindings_builder
+                    .clang_arg("-isystem")
+                    .clang_arg(include_path);
+                debug_log!("Added MSVC include path: {}", include_path);
+            }
+        }
+        
+        // Add MSVC compatibility flags
+        bindings_builder = bindings_builder
+            .clang_arg(format!("--target={}", target_triple))
+            .clang_arg("-fms-compatibility")
+            .clang_arg("-fms-extensions");
+
+        debug_log!("Configured bindgen with MSVC toolchain for target: {}", target_triple);
+    }
     let bindings = bindings_builder
         .generate()
         .expect("Failed to generate bindings");
