Merge branch 'main' into 134-add-windows-to-test-ci

Author: MarcusDunn

llama-cpp-2/src/model/params.rs

@@ -180,7 +180,10 @@ impl LlamaModelParams {
 /// ```
 /// # use llama_cpp_2::model::params::LlamaModelParams;
 /// let params = LlamaModelParams::default();
+/// #[cfg(not(target_os = "macos"))]
 /// assert_eq!(params.n_gpu_layers(), 0, "n_gpu_layers should be 0");
+/// #[cfg(target_os = "macos")]
+/// assert_eq!(params.n_gpu_layers(), 999, "n_gpu_layers should be 999");
 /// assert_eq!(params.main_gpu(), 0, "main_gpu should be 0");
 /// assert_eq!(params.vocab_only(), false, "vocab_only should be false");
 /// assert_eq!(params.use_mmap(), true, "use_mmap should be true");

llama-cpp-sys-2/Cargo.toml

@@ -32,6 +32,7 @@ include = [
     "/llama.cpp/llama.cpp",
     "/llama.cpp/llama.h",
     "/llama.cpp/unicode.h",
+    "/llama.cpp/unicode.cpp",
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

llama-cpp-sys-2/build.rs

@@ -130,7 +130,7 @@ fn main() {
         llama_cpp.define("GGML_USE_ACCELERATE", None);
         llama_cpp.define("ACCELERATE_NEW_LAPACK", None);
         llama_cpp.define("ACCELERATE_LAPACK_ILP64", None);
-        println!("cargo:rustc-link-arg=framework=Accelerate");
+        println!("cargo:rustc-link-lib=framework=Accelerate");
 
         metal_hack(&mut ggml);
         ggml.include("./llama.cpp/ggml-metal.h");
@@ -156,7 +156,8 @@ fn main() {
         .define("_XOPEN_SOURCE", Some("600"))
         .include("llama.cpp")
         .std("c++11")
-        .file("llama.cpp/llama.cpp");
+        .file("llama.cpp/llama.cpp")
+        .file("llama.cpp/unicode.cpp");
 
     // Remove debug log output from `llama.cpp`
     let is_release = env::var("PROFILE").unwrap() == "release";
@@ -199,6 +200,9 @@ fn main() {
     bindings
         .write_to_file(out_path.join("bindings.rs"))
         .expect("failed to write bindings to file");
+    let llama_cpp_dir = PathBuf::from("llama.cpp").canonicalize().unwrap();
+    println!("cargo:INCLUDE={}", llama_cpp_dir.to_str().unwrap());
+    println!("cargo:OUT_DIR={}", out_path.to_str().unwrap());
 }
 
 // courtesy of https://github.com/rustformers/llm