refactor: reintroduce ggml-sys and bindgen tool

rustformers · Apr 30, 2023 · 181d823 · 181d823
1 parent 1eb2e11
commit 181d823
Show file tree

Hide file tree

Showing 15 changed files with 1,797 additions and 128 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "ggml/ggml"]
-	path = ggml/ggml
+	path = ggml/sys/ggml
 	url = git@github.com:ggerganov/ggml.git
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,12 +9,13 @@ When new GGML versions are pushed to llama.cpp (or one of the other repos
 hosting a copy of it) and we want to update our copy, the process should be as
 follows:
 
-- Update the `ggml.c` and `ggml.h` inside `ggml-sys/ggml`.
-- In that same folder, update `CREDITS.txt` to indicate the llama.cpp version 
-  these files were taken from 
+- Update the submodule to the latest version of GGML:
+  ```shell
+  $ git submodule update --remote
+  ```
 - Run the bindgen script:
-    ```shell
-    $ cargo run --bin generate-ggml-bindings ggml-sys
-    ```
+  ```shell
+  $ cargo run --bin generate-ggml-bindings ggml-sys
+  ```
 - Fix any compiler errors that pop up due to the new version of the bindings and
   test the changes.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,11 +3,13 @@ members = [
     # Crates
     "bloom",
     "ggml",
+    "ggml/sys",
     "gpt2",
     "llama",
     "llm",
     "llm-base",
     "llm-cli",
+    "tools/*"
 ]
 resolver = "2"
 

diff --git a/ggml/Cargo.toml b/ggml/Cargo.toml
@@ -3,12 +3,9 @@ name = "ggml"
 version = { workspace = true }
 edition = "2021"
 
-[build-dependencies]
-bindgen = "0.64.0"
-cc = "^1.0"
-
 [dependencies]
 thiserror = "1.0"
+ggml-sys = { path = "sys" }
 
 [dev-dependencies]
-rand = "0.8"
+rand = "0.8"
diff --git a/ggml/ggml b/ggml/ggml