Structural Overhaul

.github/workflows/rust.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -18,23 +18,27 @@ jobs:
         os: [windows-latest, ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@stable
-    - name: Check
-      run: cargo check --verbose
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Check
+        run: cargo check --verbose
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose
   fmt:
     name: Clippy and formatting
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@stable
-      with:
-        components: rustfmt, clippy
-    - name: Formatting
-      run: cargo fmt --all -- --check
-    - name: Clippy
-      run: cargo clippy -- -Dclippy::all # -Dclippy::pedantic
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+      - name: Formatting
+        run: cargo fmt --all -- --check
+      - name: Clippy
+        run: cargo clippy -- -Dclippy::all # -Dclippy::pedantic

.gitignore

@@ -1 +1,3 @@
 /target
+/models
+.DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ggml/ggml"]
+	path = ggml/sys/ggml
+	url = git@github.com:ggerganov/ggml.git

.vscode/launch.json

@@ -0,0 +1,62 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug example 'bloom_inference'",
+      "cargo": {
+        "args": [
+          "build",
+          "--example=bloom_inference",
+          "--package=bloom"
+        ],
+        "filter": {
+          "name": "bloom_inference",
+          "kind": "example"
+        }
+      },
+      "args": ["${env:HOME}/.ggml-models/bloom-7b.bin"],
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug example 'gpt2_inference'",
+      "cargo": {
+        "args": [
+          "build",
+          "--example=gpt2_inference",
+          "--package=gpt2"
+        ],
+        "filter": {
+          "name": "gpt2_inference",
+          "kind": "example"
+        }
+      },
+      "args": ["${env:HOME}/.ggml-models/cerebras-gpt-13b.bin"],
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug example 'llama_inference'",
+      "cargo": {
+        "args": [
+          "build",
+          "--example=llama_inference",
+          "--package=llama"
+        ],
+        "filter": {
+          "name": "llama_inference",
+          "kind": "example"
+        }
+      },
+      "args": ["${env:HOME}/.ggml-models/gpt4all-7b.bin"],
+      "cwd": "${workspaceFolder}"
+    }
+  ]
+}

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.

Cargo.toml

@@ -1,16 +1,23 @@
 [workspace]
 members = [
-    "ggml-sys",
+    # Crates
+    "bloom",
     "ggml",
-    "ggml-format",
-    "llama-rs",
-    "llama-cli",
-    "generate-ggml-bindings"
+    "ggml/sys",
+    "gpt2",
+    "llama",
+    "llm",
+    "llm-base",
+    "llm-cli",
+    "tools/*"
 ]
 resolver = "2"
 
 [workspace.package]
 version = "0.1.0"
 
 [workspace.dependencies]
+bytemuck = "1.13.1"
+log = "0.4"
 rand = "0.8.5"
+serde = { version = "1.0", features = ["derive"] }