Update llama.cpp to v0.8.0

Cargo.toml

@@ -7,11 +7,13 @@ members = [
   "llama-cpp-bindings",
   "llama-cpp-bindings-tests",
   "llama-cpp-error-recorder",
+  "llama-cpp-fault-injection",
   "llama-cpp-ffi-status",
   "llama-cpp-gbnf",
   "llama-cpp-log-decoder",
   "llama-cpp-test-harness",
   "llama-cpp-test-harness-macros",
+  "llama-cpp-test-model-provisioning",
   "llama-cpp-wrapper-error-fixture",
   "llama-cpp-wrapper-sources",
 ]
@@ -43,11 +45,12 @@ llama-cpp-gbnf = { path = "llama-cpp-gbnf", version = "=0.26.0" }
 llama-cpp-log-decoder = { path = "llama-cpp-log-decoder", version = "=0.26.0" }
 llama-cpp-test-harness = { path = "llama-cpp-test-harness", version = "=0.26.0" }
 llama-cpp-test-harness-macros = { path = "llama-cpp-test-harness-macros", version = "=0.26.0" }
+llama-cpp-test-model-provisioning = { path = "llama-cpp-test-model-provisioning", version = "=0.26.0" }
+llama-cpp-fault-injection = { path = "llama-cpp-fault-injection" }
 llama-cpp-wrapper-error-fixture = { path = "llama-cpp-wrapper-error-fixture" }
 llama-cpp-wrapper-sources = { path = "llama-cpp-wrapper-sources", version = "=0.26.0" }
 llguidance = "=1.7.0"
 log = "=0.4.29"
-nom = "=8.0.0"
 once_cell = "1.21"
 proc-macro2 = "=1.0.106"
 quote = "=1.0.45"

Makefile

@@ -19,12 +19,8 @@ WRAPPER_SOURCES_RESPONSE_FILE = target/wrapper_sources.rsp
 WRAPPER_SOURCES_CRATE = llama-cpp-wrapper-sources
 
 WRAPPER_SOURCES_CRATE_FILES = \
-	$(WRAPPER_SOURCES_CRATE)/src/compile_commands_file.rs \
-	$(WRAPPER_SOURCES_CRATE)/src/cpp_standard.rs \
-	$(WRAPPER_SOURCES_CRATE)/src/wrapper_include_dirs.rs \
-	$(WRAPPER_SOURCES_CRATE)/src/wrapper_source_paths.rs \
-	$(WRAPPER_SOURCES_CRATE)/src/wrapper_sources.rs \
-	$(WRAPPER_SOURCES_CRATE)/src/wrapper_sources_response_file.rs
+	$(WRAPPER_SOURCES_CRATE)/Cargo.toml \
+	$(wildcard $(WRAPPER_SOURCES_CRATE)/src/*.rs)
 
 EMIT_WRAPPER_BUILD_INPUTS = cargo run --quiet --package $(WRAPPER_SOURCES_CRATE) -- \
 	$(CURDIR)/llama-cpp-bindings-sys $(COMPILE_COMMANDS) $(WRAPPER_SOURCES_RESPONSE_FILE)
@@ -76,14 +72,18 @@ coverage: node_modules
 	cargo llvm-cov report
 	./node_modules/.bin/rust-coverage-check target/llvm-cov.json \
 		--workspace-root $(CURDIR) \
-		--gated llama-cpp-bindings=98 \
+		--gated llama-cpp-bindings=100 \
+		--gated llama-cpp-bindings-build=100 \
+		--gated llama-cpp-bindings-tests=100 \
 		--gated llama-cpp-bindings-types=100 \
 		--gated llama-cpp-error-recorder=100 \
+		--gated llama-cpp-fault-injection=100 \
 		--gated llama-cpp-ffi-status=100 \
 		--gated llama-cpp-gbnf=100 \
 		--gated llama-cpp-log-decoder=100 \
-		--gated llama-cpp-test-harness=99 \
+		--gated llama-cpp-test-harness=100 \
 		--gated llama-cpp-test-harness-macros=100 \
+		--gated llama-cpp-test-model-provisioning=100 \
 		--gated llama-cpp-wrapper-sources=100
 
 .PHONY: coverage-clean
@@ -123,13 +123,15 @@ test: 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 -p llama-cpp-test-harness-macros -p llama-cpp-test-harness \
+		-p llama-cpp-test-model-provisioning $(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-bindings -p llama-cpp-bindings-build -p llama-cpp-gbnf \
+	cargo test -p llama-cpp-bindings -p llama-cpp-bindings-build -p llama-cpp-bindings-types \
+		-p llama-cpp-error-recorder -p llama-cpp-ffi-status -p llama-cpp-gbnf \
 		-p llama-cpp-log-decoder -p llama-cpp-wrapper-sources $(DEVICE_FEATURE)

llama-cpp-bindings-build/Cargo.toml

@@ -10,8 +10,11 @@ repository.workspace = true
 bindgen = { workspace = true }
 cc = { workspace = true }
 cmake = { workspace = true }
+enumflags2 = { workspace = true }
 find_cuda_helper = { workspace = true }
 llama-cpp-wrapper-sources = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 thiserror = { workspace = true }
 
 [features]
@@ -20,6 +23,7 @@ cuda-no-vmm = ["cuda"]
 metal = []
 dynamic-link = []
 dynamic-backends = ["dynamic-link"]
+fault-injection = []
 vulkan = []
 openmp = []
 rocm = []

llama-cpp-bindings-build/cmake/cache_query.cmake

@@ -0,0 +1 @@
+file(WRITE "${CMAKE_BINARY_DIR}/.cmake/api/v1/query/cache-v2" "")

llama-cpp-bindings-build/fixtures/bindings/llama_types.h

@@ -0,0 +1,20 @@
+#pragma once
+
+struct llama_context_params {
+    float defrag_thold;
+    unsigned int n_ctx;
+};
+
+struct llama_token_data {
+    int id;
+    float logit;
+};
+
+struct llama_sampler_chain_params {
+    int no_perf;
+};
+
+enum ggml_prec {
+    GGML_PREC_UNDEFINED = 0,
+    GGML_PREC_DEFAULT = 0,
+};

llama-cpp-bindings-build/fixtures/bindings/missing_privatized_field.h

@@ -0,0 +1,5 @@
+#pragma once
+
+struct llama_context_params {
+    unsigned int n_ctx;
+};

llama-cpp-bindings-build/fixtures/bindings/wrapper.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include "llama_types.h"
+
+struct mtmd_context_params {
+    const char * image_marker;
+    const char * media_marker;
+};

llama-cpp-bindings-build/fixtures/cmake_file_api/index_naming_a_missing_cache/.cmake/api/v1/reply/index-0.json

@@ -0,0 +1 @@
+{"reply":{"cache-v2":{"kind":"cache","version":{"major":2,"minor":0},"jsonFile":"cache-v2-missing.json"}}}

llama-cpp-bindings-build/fixtures/cmake_file_api/index_without_cache_reply/.cmake/api/v1/reply/index-0.json

@@ -0,0 +1 @@
+{"reply":{}}

llama-cpp-bindings-build/fixtures/cmake_file_api/reply_without_index/.cmake/api/v1/reply/cache-v2-0.json

@@ -0,0 +1 @@
+{"kind":"cache","version":{"major":2,"minor":0},"entries":[]}

llama-cpp-bindings-build/fixtures/cmake_project/CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.14)
+project(llama_cpp_bindings_build_fixture C)
+
+if(NOT DEFINED FIXTURE_LIBRARY_NAME)
+    message(FATAL_ERROR "FIXTURE_LIBRARY_NAME must be defined")
+endif()
+
+add_library(${FIXTURE_LIBRARY_NAME} STATIC fixture.c)
+
+install(TARGETS ${FIXTURE_LIBRARY_NAME} DESTINATION lib)
+
+set(GGML_OPENMP_ENABLED "ON" CACHE INTERNAL "")
+set(OpenMP_C_LIB_NAMES "${FIXTURE_LIBRARY_NAME}" CACHE STRING "")
+set(OpenMP_CXX_LIB_NAMES "${FIXTURE_LIBRARY_NAME}" CACHE STRING "")
+set(OpenMP_${FIXTURE_LIBRARY_NAME}_LIBRARY
+    "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${FIXTURE_LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    CACHE FILEPATH "")

llama-cpp-bindings-build/fixtures/cmake_project/fixture.c

@@ -0,0 +1,3 @@
+int llama_cpp_bindings_build_fixture(void) {
+    return 0;
+}

llama-cpp-bindings-build/fixtures/wrapper/vendor/vendored.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#define VENDORED_VALUE 7

llama-cpp-bindings-build/fixtures/wrapper/wrapper_fixture.cpp

@@ -0,0 +1,9 @@
+#include <vendored.h>
+
+#ifndef WRAPPER_FIXTURE_DEFINE
+#error "WRAPPER_FIXTURE_DEFINE must be defined"
+#endif
+
+extern "C" auto llama_cpp_bindings_build_wrapper_fixture() -> int {
+    return VENDORED_VALUE;
+}

llama-cpp-bindings-build/src/android_architecture.rs

@@ -0,0 +1,69 @@
+use crate::build_error::BuildError;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum AndroidArchitecture {
+    Aarch64,
+    Armv7,
+    X86_64,
+    X86,
+}
+
+impl AndroidArchitecture {
+    /// # Errors
+    ///
+    /// Returns [`BuildError::UnsupportedAndroidTarget`] for an architecture the NDK does not
+    /// build for.
+    pub fn from_cargo_cfg(cargo_cfg_target_arch: &str) -> Result<Self, BuildError> {
+        match cargo_cfg_target_arch {
+            "aarch64" => Ok(Self::Aarch64),
+            "arm" => Ok(Self::Armv7),
+            "x86_64" => Ok(Self::X86_64),
+            "x86" => Ok(Self::X86),
+            unsupported => Err(BuildError::UnsupportedAndroidTarget {
+                cargo_cfg_target_arch: unsupported.to_owned(),
+            }),
+        }
+    }
+
+    #[must_use]
+    pub const fn abi(self) -> &'static str {
+        match self {
+            Self::Aarch64 => "arm64-v8a",
+            Self::Armv7 => "armeabi-v7a",
+            Self::X86_64 => "x86_64",
+            Self::X86 => "x86",
+        }
+    }
+
+    #[must_use]
+    pub const fn ndk_prefix(self) -> &'static str {
+        match self {
+            Self::Aarch64 => "aarch64-linux-android",
+            Self::Armv7 => "arm-linux-androideabi",
+            Self::X86_64 => "x86_64-linux-android",
+            Self::X86 => "i686-linux-android",
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::AndroidArchitecture;
+
+    #[test]
+    fn every_supported_android_architecture_maps_to_its_abi_and_ndk_prefix() {
+        assert_eq!(
+            ["aarch64", "arm", "x86_64", "x86"].map(|cargo_cfg_target_arch| {
+                AndroidArchitecture::from_cargo_cfg(cargo_cfg_target_arch)
+                    .map(|architecture| [architecture.abi(), architecture.ndk_prefix()])
+                    .ok()
+            }),
+            [
+                Some(["arm64-v8a", "aarch64-linux-android"]),
+                Some(["armeabi-v7a", "arm-linux-androideabi"]),
+                Some(["x86_64", "x86_64-linux-android"]),
+                Some(["x86", "i686-linux-android"]),
+            ]
+        );
+    }
+}