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/src/whisper_params.rs b/src/whisper_params.rs index d412bf1..36a709e 100644 --- a/src/whisper_params.rs +++ b/src/whisper_params.rs @@ -304,8 +304,8 @@ impl<'a, 'b> FullParams<'a, 'b> { /// for more information. /// /// Defaults to false. - pub fn set_suppress_non_speech_tokens(&mut self, suppress_non_speech_tokens: bool) { - self.fp.suppress_non_speech_tokens = suppress_non_speech_tokens; + pub fn set_suppress_nst(&mut self, suppress_nst: bool) { + self.fp.suppress_nst = suppress_nst; } /// Set initial decoding temperature. diff --git a/sys/build.rs b/sys/build.rs index ef72d84..8181d24 100644 --- a/sys/build.rs +++ b/sys/build.rs @@ -253,6 +253,18 @@ fn main() { println!("cargo:rustc-link-search=native={}", destination.display()); println!("cargo:rustc-link-lib=static=whisper"); println!("cargo:rustc-link-lib=static=ggml"); + println!("cargo:rustc-link-lib=static=ggml-base"); + println!("cargo:rustc-link-lib=static=ggml-cpu"); + if cfg!(target_os = "macos") { + println!("cargo:rustc-link-lib=static=ggml-blas"); + } + if cfg!(feature = "vulkan") { + println!("cargo:rustc-link-lib=static=ggml-vulkan"); + } + + if cfg!(feature = "metal") { + println!("cargo:rustc-link-lib=static=ggml-metal"); + } println!( "cargo:WHISPER_CPP_VERSION={}", diff --git a/sys/whisper.cpp b/sys/whisper.cpp index 0377596..8a9ad78 160000 --- a/sys/whisper.cpp +++ b/sys/whisper.cpp @@ -1 +1 @@ -Subproject commit 0377596b77a3602e36430320cbe45f8c305ef04a +Subproject commit 8a9ad7844d6e2a10cddf4b92de4089d7ac2b14a9