Skip to content

Commit ea798fa

Browse files
authored
Merge pull request #489 from thewh1teagle/feat/compile-with-cmake
Feat/compile with cmake
2 parents a1fcb47 + e22d8d5 commit ea798fa

File tree

5 files changed

+283
-1101
lines changed

5 files changed

+283
-1101
lines changed

Cargo.lock

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

llama-cpp-2/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ tracing = { workspace = true }
1818
encoding_rs = { workspace = true }
1919

2020
[features]
21+
default = ["openmp"]
2122
cuda = ["llama-cpp-sys-2/cuda"]
2223
metal = ["llama-cpp-sys-2/metal"]
23-
dynamic_link = ["llama-cpp-sys-2/dynamic_link"]
24+
dynamic-link = ["llama-cpp-sys-2/dynamic-link"]
2425
vulkan = ["llama-cpp-sys-2/vulkan"]
2526
native = ["llama-cpp-sys-2/native"]
27+
openmp = ["llama-cpp-sys-2/openmp"]
2628
sampler = []
2729

30+
2831
[target.'cfg(all(target_os = "macos", any(target_arch = "aarch64", target_arch = "arm64")))'.dependencies]
2932
llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.69", features = [
3033
"metal",

llama-cpp-sys-2/Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ repository = "https://github.com/utilityai/llama-cpp-rs"
88
links = "llama"
99

1010
include = [
11+
"wrapper.h",
1112
"build.rs",
1213
"/src",
1314
"/llama.cpp/ggml/src/ggml.c",
@@ -59,11 +60,13 @@ include = [
5960
[build-dependencies]
6061
bindgen = { workspace = true }
6162
cc = { workspace = true, features = ["parallel"] }
62-
once_cell = "1.19.0"
63+
cmake = "0.1"
64+
glob = "0.3.1"
6365

6466
[features]
6567
cuda = []
6668
metal = []
67-
dynamic_link = []
69+
dynamic-link = []
6870
vulkan = []
6971
native = []
72+
openmp = []

0 commit comments

Comments
 (0)