Merge pull request #181 from arizhih/whisper-cpp-1-7-x

Update whisper.cpp version to 1.7.1

.github/workflows/pr.yml

@@ -30,8 +30,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        rust-version: [stable, nightly]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        rust-version: [ stable, nightly ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out code into the proper directory
@@ -55,8 +55,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        rust-version: [stable, nightly]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        rust-version: [ stable, nightly ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out code into the proper directory
@@ -72,5 +72,9 @@ jobs:
         with:
           toolchain: ${{ matrix.rust-version }}
 
+      - name: Install OpenMP
+        run: brew install libomp
+        if: contains(matrix.os, 'macos')
+
       - name: Check build
-        run: cargo build --verbose
+        run: cargo build -F whisper-cpp-log,whisper-cpp-tracing --verbose --examples

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"
@@ -14,7 +14,7 @@ repository = "https://github.com/tazz4843/whisper-rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-whisper-rs-sys = { path = "sys", version = "0.11.0" }
+whisper-rs-sys = { path = "sys", version = "0.11.1" }
 log = { version = "0.4", optional = true }
 tracing = { version = "0.1", optional = true }
 

src/standalone.rs

@@ -83,10 +83,6 @@ pub unsafe fn set_log_callback(
 ) {
     unsafe {
         whisper_rs_sys::whisper_log_set(log_callback, user_data);
-        #[cfg(feature = "metal")]
-        {
-            whisper_rs_sys::ggml_backend_metal_log_set_callback(log_callback, user_data);
-        }
     }
 }
 

src/whisper_sys_log.rs

@@ -38,12 +38,5 @@ unsafe extern "C" fn whisper_cpp_log_trampoline(
 pub fn install_whisper_log_trampoline() {
     crate::LOG_TRAMPOLINE_INSTALL.call_once(|| unsafe {
         whisper_rs_sys::whisper_log_set(Some(whisper_cpp_log_trampoline), std::ptr::null_mut());
-        #[cfg(feature = "metal")]
-        {
-            whisper_rs_sys::ggml_backend_metal_log_set_callback(
-                Some(whisper_cpp_log_trampoline),
-                std::ptr::null_mut(),
-            );
-        }
     });
 }

src/whisper_sys_tracing.rs

@@ -38,12 +38,5 @@ unsafe extern "C" fn whisper_cpp_tracing_trampoline(
 pub fn install_whisper_tracing_trampoline() {
     crate::LOG_TRAMPOLINE_INSTALL.call_once(|| unsafe {
         whisper_rs_sys::whisper_log_set(Some(whisper_cpp_tracing_trampoline), std::ptr::null_mut());
-        #[cfg(feature = "metal")]
-        {
-            whisper_rs_sys::ggml_backend_metal_log_set_callback(
-                Some(whisper_cpp_tracing_trampoline),
-                std::ptr::null_mut(),
-            );
-        }
     });
 }

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"

sys/build.rs

@@ -93,6 +93,9 @@ fn main() {
     {
         if target.contains("gnu") {
             println!("cargo:rustc-link-lib=gomp");
+        } else if target.contains("apple") {
+            println!("cargo:rustc-link-lib=omp");
+            println!("cargo:rustc-link-search=/opt/homebrew/opt/libomp/lib");
         }
     }
 
@@ -244,8 +247,7 @@ fn main() {
 
     let destination = config.build();
 
-    add_link_search_path(&out.join("lib")).unwrap();
-    add_link_search_path(&out.join("build/src")).unwrap();
+    add_link_search_path(&out.join("build")).unwrap();
 
     println!("cargo:rustc-link-search=native={}", destination.display());
     println!("cargo:rustc-link-lib=static=whisper");

sys/whisper.cpp

@@ -1 +1 @@
-Subproject commit 9e3c5345cd46ea718209db53464e426c3fe7a25e
+Subproject commit ebca09a3d1033417b0c630bbbe607b0f185b1488