From 002c552fd766249e0a243e004a447eb566c37e28 Mon Sep 17 00:00:00 2001 From: newfla Date: Thu, 14 Nov 2024 15:08:36 +0100 Subject: [PATCH 1/6] fix: include ggml sources --- sys/Cargo.toml | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/sys/Cargo.toml b/sys/Cargo.toml index 9d64457..4321fe8 100644 --- a/sys/Cargo.toml +++ b/sys/Cargo.toml @@ -13,37 +13,27 @@ include = [ "whisper.cpp/CMakeLists.txt", "whisper.cpp/cmake", "whisper.cpp/src/coreml", + "whisper.cpp/src/openvino", "whisper.cpp/src/CMakeLists.txt", "whisper.cpp/src/whisper.cpp", + "whisper.cpp/src/ggml-cpu-impl.h", "whisper.cpp/include/whisper.h", + "whisper.cpp/ggml/cmake", "whisper.cpp/ggml/CMakeLists.txt", "whisper.cpp/ggml/src/CMakeLists.txt", - "whisper.cpp/ggml/src/ggml.c", - "whisper.cpp/ggml/src/ggml-aarch64.c", - "whisper.cpp/ggml/src/ggml-aarch64.h", - "whisper.cpp/ggml/src/ggml-alloc.c", - "whisper.cpp/ggml/src/ggml-backend-impl.h", - "whisper.cpp/ggml/src/ggml-backend.c", - "whisper.cpp/ggml/src/ggml-backend.cpp", - "whisper.cpp/ggml/src/ggml-cuda.cu", - "whisper.cpp/ggml/src/ggml-common.h", - "whisper.cpp/ggml/src/ggml-cpu-impl.h", - "whisper.cpp/ggml/src/ggml-impl.h", - "whisper.cpp/ggml/src/ggml-metal.m", - "whisper.cpp/ggml/src/ggml-metal.metal", - "whisper.cpp/ggml/src/ggml-quants.h", - "whisper.cpp/ggml/src/ggml-quants.c", - "whisper.cpp/ggml/include/ggml.h", - "whisper.cpp/ggml/include/ggml-alloc.h", - "whisper.cpp/ggml/include/ggml-backend.h", - "whisper.cpp/ggml/include/ggml-blas.h", - "whisper.cpp/ggml/include/ggml-cann.h", - "whisper.cpp/ggml/include/ggml-cuda.h", - "whisper.cpp/ggml/include/ggml-kompute.h", - "whisper.cpp/ggml/include/ggml-metal.h", - "whisper.cpp/ggml/include/ggml-rpc.h", - "whisper.cpp/ggml/include/ggml-sycl.h", - "whisper.cpp/ggml/include/ggml-vulkan.h", + "whisper.cpp/ggml/src/*.c", + "whisper.cpp/ggml/src/*.h", + "whisper.cpp/ggml/src/*.cpp", + "whisper.cpp/ggml/src/*.cu", + "whisper.cpp/ggml/src/*.m", + "whisper.cpp/ggml/src/*.metal", + "whisper.cpp/ggml/src/ggml-amx/*", + "whisper.cpp/ggml/src/ggml-cann/*", + "whisper.cpp/ggml/src/ggml-cuda/*", + "whisper.cpp/ggml/src/ggml-sycl/*", + "whisper.cpp/ggml/src/kompute-shaders/*", + "whisper.cpp/ggml/src/vulkan-shaders/*", + "whisper.cpp/ggml/include/*.h", "whisper.cpp/LICENSE", "src/*.rs", "build.rs", From 20d6d8e937940477eda13a093b371b8b14bc5ac8 Mon Sep 17 00:00:00 2001 From: newfla Date: Wed, 20 Nov 2024 21:08:51 +0100 Subject: [PATCH 2/6] fix: simplify whisper.cpp/ggml src include --- sys/Cargo.toml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/sys/Cargo.toml b/sys/Cargo.toml index 4321fe8..e0bcdac 100644 --- a/sys/Cargo.toml +++ b/sys/Cargo.toml @@ -12,27 +12,11 @@ include = [ "whisper.cpp/bindings/CMakeLists.txt", "whisper.cpp/CMakeLists.txt", "whisper.cpp/cmake", - "whisper.cpp/src/coreml", - "whisper.cpp/src/openvino", - "whisper.cpp/src/CMakeLists.txt", - "whisper.cpp/src/whisper.cpp", - "whisper.cpp/src/ggml-cpu-impl.h", + "whisper.cpp/src/**", "whisper.cpp/include/whisper.h", "whisper.cpp/ggml/cmake", "whisper.cpp/ggml/CMakeLists.txt", - "whisper.cpp/ggml/src/CMakeLists.txt", - "whisper.cpp/ggml/src/*.c", - "whisper.cpp/ggml/src/*.h", - "whisper.cpp/ggml/src/*.cpp", - "whisper.cpp/ggml/src/*.cu", - "whisper.cpp/ggml/src/*.m", - "whisper.cpp/ggml/src/*.metal", - "whisper.cpp/ggml/src/ggml-amx/*", - "whisper.cpp/ggml/src/ggml-cann/*", - "whisper.cpp/ggml/src/ggml-cuda/*", - "whisper.cpp/ggml/src/ggml-sycl/*", - "whisper.cpp/ggml/src/kompute-shaders/*", - "whisper.cpp/ggml/src/vulkan-shaders/*", + "whisper.cpp/ggml/src/**", "whisper.cpp/ggml/include/*.h", "whisper.cpp/LICENSE", "src/*.rs", From 13f8a8d70a497a7df94cdcc9bdda62c6750ed893 Mon Sep 17 00:00:00 2001 From: Niko Date: Fri, 22 Nov 2024 10:50:11 -0700 Subject: [PATCH 3/6] Bump whisper-rs-sys minor version --- sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/Cargo.toml b/sys/Cargo.toml index e0bcdac..0707ec2 100644 --- a/sys/Cargo.toml +++ b/sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "whisper-rs-sys" -version = "0.11.0" +version = "0.11.1" edition = "2021" description = "Rust bindings for whisper.cpp (FFI bindings)" license = "Unlicense" From 5448241496899732416b1b82b4e998863d5e9715 Mon Sep 17 00:00:00 2001 From: Niko Date: Fri, 22 Nov 2024 10:53:09 -0700 Subject: [PATCH 4/6] Fix docs.rs 0.13 build --- Cargo.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 86a5089..e5b1643 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,6 +37,3 @@ test-with-tiny-model = [] whisper-cpp-log = ["dep:log"] whisper-cpp-tracing = ["dep:tracing"] openmp = ["whisper-rs-sys/openmp"] - -[package.metadata.docs.rs] -features = ["simd"] From 71ab110e047f890aae8fa812a5b09472afd63c24 Mon Sep 17 00:00:00 2001 From: Niko Date: Fri, 22 Nov 2024 10:53:20 -0700 Subject: [PATCH 5/6] Bump minor version of whisper-rs --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e5b1643..5ea8246 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ exclude = ["examples/full_usage"] [package] name = "whisper-rs" -version = "0.13.0" +version = "0.13.1" edition = "2021" description = "Rust bindings for whisper.cpp" license = "Unlicense" From fab85025be2fc90c7fbf03aad80cb0747160de09 Mon Sep 17 00:00:00 2001 From: thewh1teagle <61390950+thewh1teagle@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:25:22 +0200 Subject: [PATCH 6/6] update whisper.cpp to 7fd8d9 --- src/standalone.rs | 4 ---- sys/whisper.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/standalone.rs b/src/standalone.rs index 7319126..2b0d439 100644 --- a/src/standalone.rs +++ b/src/standalone.rs @@ -105,8 +105,6 @@ pub struct SystemInfo { pub avx2: bool, pub fma: bool, pub f16c: bool, - pub blas: bool, - pub cuda: bool, } impl Default for SystemInfo { @@ -117,8 +115,6 @@ impl Default for SystemInfo { avx2: whisper_rs_sys::ggml_cpu_has_avx2() != 0, fma: whisper_rs_sys::ggml_cpu_has_fma() != 0, f16c: whisper_rs_sys::ggml_cpu_has_f16c() != 0, - blas: whisper_rs_sys::ggml_cpu_has_blas() != 0, - cuda: whisper_rs_sys::ggml_cpu_has_cuda() != 0, } } } diff --git a/sys/whisper.cpp b/sys/whisper.cpp index 0377596..8c6a9b8 160000 --- a/sys/whisper.cpp +++ b/sys/whisper.cpp @@ -1 +1 @@ -Subproject commit 0377596b77a3602e36430320cbe45f8c305ef04a +Subproject commit 8c6a9b8bb6a0273cc0b5915903ca1ff9206c6285