Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ members = [

[workspace.package]
edition = "2024"
version = "0.12.0"
version = "0.13.0"
license = "Apache-2.0"
repository = "https://github.com/intentee/llama-cpp-bindings"

Expand All @@ -31,15 +31,15 @@ glob = "=0.3.3"
hf-hub = "=0.5.0"
inventory = "=0.3.24"
libtest-mimic = "=0.8.2"
llama-cpp-bindings = { path = "llama-cpp-bindings", version = "=0.12.0" }
llama-cpp-bindings-build = { path = "llama-cpp-bindings-build", version = "=0.12.0" }
llama-cpp-bindings-sys = { path = "llama-cpp-bindings-sys", version = "=0.12.0" }
llama-cpp-bindings-types = { path = "llama-cpp-bindings-types", version = "=0.12.0" }
llama-cpp-error-recorder = { path = "llama-cpp-error-recorder", version = "=0.12.0" }
llama-cpp-gbnf = { path = "llama-cpp-gbnf", version = "=0.12.0" }
llama-cpp-log-decoder = { path = "llama-cpp-log-decoder", version = "=0.12.0" }
llama-cpp-test-harness = { path = "llama-cpp-test-harness", version = "=0.12.0" }
llama-cpp-test-harness-macros = { path = "llama-cpp-test-harness-macros", version = "=0.12.0" }
llama-cpp-bindings = { path = "llama-cpp-bindings", version = "=0.13.0" }
llama-cpp-bindings-build = { path = "llama-cpp-bindings-build", version = "=0.13.0" }
llama-cpp-bindings-sys = { path = "llama-cpp-bindings-sys", version = "=0.13.0" }
llama-cpp-bindings-types = { path = "llama-cpp-bindings-types", version = "=0.13.0" }
llama-cpp-error-recorder = { path = "llama-cpp-error-recorder", version = "=0.13.0" }
llama-cpp-gbnf = { path = "llama-cpp-gbnf", version = "=0.13.0" }
llama-cpp-log-decoder = { path = "llama-cpp-log-decoder", version = "=0.13.0" }
llama-cpp-test-harness = { path = "llama-cpp-test-harness", version = "=0.13.0" }
llama-cpp-test-harness-macros = { path = "llama-cpp-test-harness-macros", version = "=0.13.0" }
llguidance = "=1.7.0"
log = "=0.4.29"
nom = "=8.0.0"
Expand Down
11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
TEST_DEVICE ?=

DEVICE_FEATURE = $(if $(TEST_DEVICE),--features $(TEST_DEVICE),)
COVERAGE_WORKSPACE_ROOT = $(if $(findstring :/,$(CURDIR)),$(subst /,\,$(CURDIR)),$(CURDIR))

node_modules: package-lock.json
npm ci
Expand All @@ -25,8 +26,9 @@ coverage: node_modules
cargo llvm-cov report --lcov --output-path target/lcov.info
cargo llvm-cov report
npx rust-coverage-check target/llvm-cov.json \
--workspace-root $(CURDIR) \
--workspace-root $(COVERAGE_WORKSPACE_ROOT) \
--gated llama-cpp-bindings=98 \
--gated llama-cpp-bindings-build=96 \
--gated llama-cpp-error-recorder=100 \
--gated llama-cpp-gbnf=100 \
--gated llama-cpp-log-decoder=100 \
Expand Down Expand Up @@ -76,12 +78,15 @@ test: test.unit test.llms

.PHONY: test.harness
test.harness: clippy
cargo test -p llama-cpp-test-harness-macros -p llama-cpp-test-harness $(DEVICE_FEATURE)
cargo test --no-fail-fast -p llama-cpp-test-harness-macros -p llama-cpp-test-harness $(DEVICE_FEATURE)

.PHONY: test.llms
test.llms: clippy test.harness test.unit
cargo test --no-fail-fast -p llama-cpp-bindings-tests $(DEVICE_FEATURE)

.PHONY: test.unit
test.unit: clippy
cargo test -p llama-cpp-log-decoder -p llama-cpp-gbnf -p llama-cpp-bindings $(DEVICE_FEATURE)
cargo test --workspace --no-fail-fast $(DEVICE_FEATURE) \
--exclude llama-cpp-bindings-tests \
--exclude llama-cpp-test-harness \
--exclude llama-cpp-test-harness-macros
3 changes: 3 additions & 0 deletions llama-cpp-bindings-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ glob = { workspace = true }
thiserror = { workspace = true }
walkdir = { workspace = true }

[dev-dependencies]
serial_test = { workspace = true }

[features]
cuda = []
cuda-no-vmm = ["cuda"]
Expand Down
Loading
Loading