Merge branch 'master' into add_initial_prompt_param

This commit is contained in:
Chris Raethke 2023-11-27 12:57:18 +10:00 committed by GitHub
commit 41d73af64c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 7 deletions

View file

@ -14,6 +14,7 @@ pub use standalone::*;
pub use utilities::*;
pub use whisper_ctx::WhisperContext;
pub use whisper_ctx::WhisperContextParameters;
pub use whisper_grammar::{WhisperGrammarElement, WhisperGrammarElementType};
pub use whisper_params::{FullParams, SamplingStrategy};
pub use whisper_state::WhisperState;

View file

@ -551,7 +551,7 @@ impl WhisperContextParameters {
pub fn new() -> Self {
Self::default()
}
pub fn use_gpu(mut self, use_gpu: bool) -> Self {
pub fn use_gpu(&mut self, use_gpu: bool) -> &mut Self {
self.use_gpu = use_gpu;
self
}

View file

@ -15,15 +15,21 @@ include = [
"whisper.cpp/CMakeLists.txt",
"whisper.cpp/ggml.c",
"whisper.cpp/ggml.h",
"whisper.cpp/ggml-opencl.c",
"whisper.cpp/ggml-opencl.h",
"whisper.cpp/ggml-alloc.c",
"whisper.cpp/ggml-alloc.h",
"whisper.cpp/ggml-backend.c",
"whisper.cpp/ggml-backend.h",
"whisper.cpp/ggml-backend-impl.h",
"whisper.cpp/ggml-cuda.cu",
"whisper.cpp/ggml-cuda.h",
"whisper.cpp/ggml-alloc.h",
"whisper.cpp/ggml-alloc.c",
"whisper.cpp/ggml-metal.metal",
"whisper.cpp/ggml-metal.m",
"whisper.cpp/ggml-impl.h",
"whisper.cpp/ggml-metal.h",
"whisper.cpp/ggml-metal.m",
"whisper.cpp/ggml-metal.metal",
"whisper.cpp/ggml-opencl.cpp",
"whisper.cpp/ggml-opencl.h",
"whisper.cpp/ggml-quants.h",
"whisper.cpp/ggml-quants.c",
"whisper.cpp/LICENSE",
"whisper.cpp/whisper.cpp",
"whisper.cpp/whisper.h",