Merge pull request #199 from schnaq/update/whisper

Update whisper.cpp to v1.7.4; rename suppress_nst
This commit is contained in:
Niko 2025-02-15 08:11:21 +00:00 committed by GitHub
commit 3c20758cce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 7 deletions

View file

@ -105,8 +105,6 @@ pub struct SystemInfo {
pub avx2: bool, pub avx2: bool,
pub fma: bool, pub fma: bool,
pub f16c: bool, pub f16c: bool,
pub blas: bool,
pub cuda: bool,
} }
impl Default for SystemInfo { impl Default for SystemInfo {
@ -117,8 +115,6 @@ impl Default for SystemInfo {
avx2: whisper_rs_sys::ggml_cpu_has_avx2() != 0, avx2: whisper_rs_sys::ggml_cpu_has_avx2() != 0,
fma: whisper_rs_sys::ggml_cpu_has_fma() != 0, fma: whisper_rs_sys::ggml_cpu_has_fma() != 0,
f16c: whisper_rs_sys::ggml_cpu_has_f16c() != 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,
} }
} }
} }

View file

@ -304,8 +304,8 @@ impl<'a, 'b> FullParams<'a, 'b> {
/// for more information. /// for more information.
/// ///
/// Defaults to false. /// Defaults to false.
pub fn set_suppress_non_speech_tokens(&mut self, suppress_non_speech_tokens: bool) { pub fn set_suppress_nst(&mut self, suppress_nst: bool) {
self.fp.suppress_non_speech_tokens = suppress_non_speech_tokens; self.fp.suppress_nst = suppress_nst;
} }
/// Set initial decoding temperature. /// Set initial decoding temperature.

View file

@ -253,6 +253,18 @@ fn main() {
println!("cargo:rustc-link-search=native={}", destination.display()); println!("cargo:rustc-link-search=native={}", destination.display());
println!("cargo:rustc-link-lib=static=whisper"); println!("cargo:rustc-link-lib=static=whisper");
println!("cargo:rustc-link-lib=static=ggml"); 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!( println!(
"cargo:WHISPER_CPP_VERSION={}", "cargo:WHISPER_CPP_VERSION={}",

@ -1 +1 @@
Subproject commit 0377596b77a3602e36430320cbe45f8c305ef04a Subproject commit 8a9ad7844d6e2a10cddf4b92de4089d7ac2b14a9