Merge pull request #489 from thewh1teagle/feat/compile-with-cmake

Feat/compile with cmake
utilityai · Sep 4, 2024 · ea798fa · ea798fa
2 parents a1fcb47 + e22d8d5
commit ea798fa
Show file tree

Hide file tree

Showing 5 changed files with 283 additions and 1,101 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/llama-cpp-2/Cargo.toml b/llama-cpp-2/Cargo.toml
@@ -18,13 +18,16 @@ tracing = { workspace = true }
 encoding_rs = { workspace = true }
 
 [features]
+default = ["openmp"]
 cuda = ["llama-cpp-sys-2/cuda"]
 metal = ["llama-cpp-sys-2/metal"]
-dynamic_link = ["llama-cpp-sys-2/dynamic_link"]
+dynamic-link = ["llama-cpp-sys-2/dynamic-link"]
 vulkan = ["llama-cpp-sys-2/vulkan"]
 native = ["llama-cpp-sys-2/native"]
+openmp = ["llama-cpp-sys-2/openmp"]
 sampler = []
 
+
 [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.69", features = [
     "metal",

diff --git a/llama-cpp-sys-2/Cargo.toml b/llama-cpp-sys-2/Cargo.toml
@@ -8,6 +8,7 @@ repository = "https://github.com/utilityai/llama-cpp-rs"
 links = "llama"
 
 include = [
+    "wrapper.h",
     "build.rs",
     "/src",
     "/llama.cpp/ggml/src/ggml.c",
@@ -59,11 +60,13 @@ include = [
 [build-dependencies]
 bindgen = { workspace = true }
 cc = { workspace = true, features = ["parallel"] }
-once_cell = "1.19.0"
+cmake = "0.1"
+glob = "0.3.1"
 
 [features]
 cuda = []
 metal = []
-dynamic_link = []
+dynamic-link = []
 vulkan = []
 native = []
+openmp = []