Migrations
/
whisper.cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whisper : rename whisper_init to whisper_init_from_file

Browse Source
pull/353/head
Syahmi Azhar 3 years ago committed by Georgi Gerganov
parent 6859c6207a
commit 878a84d78f
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
17 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
bindings/go/whisper.go
Unescape View File

@ -91,7 +91,7 @@ var (
func Whisper_init(path string) *Context { func Whisper_init(path string) *Context {
cPath := C.CString(path) cPath := C.CString(path)
defer C.free(unsafe.Pointer(cPath)) defer C.free(unsafe.Pointer(cPath))
if ctx := C.whisper_init(cPath); ctx != nil { if ctx := C.whisper_init_from_file(cPath); ctx != nil {
return (*Context)(ctx) return (*Context)(ctx)
} else { } else {
return nil return nil

2
bindings/javascript/emscripten.cpp
Unescape View File

@ -20,7 +20,7 @@ struct whisper_context * g_context;
EMSCRIPTEN_BINDINGS(whisper) { EMSCRIPTEN_BINDINGS(whisper) {
emscripten::function("init", emscripten::optional_override([](const std::string & path_model) { emscripten::function("init", emscripten::optional_override([](const std::string & path_model) {
if (g_context == nullptr) { if (g_context == nullptr) {
g_context = whisper_init(path_model.c_str()); g_context = whisper_init_from_file(path_model.c_str());
if (g_context != nullptr) { if (g_context != nullptr) {
return true; return true;
} else { } else {

2
examples/bench.wasm/emscripten.cpp
Unescape View File

@ -52,7 +52,7 @@ EMSCRIPTEN_BINDINGS(bench) {
emscripten::function("init", emscripten::optional_override([](const std::string & path_model) { emscripten::function("init", emscripten::optional_override([](const std::string & path_model) {
for (size_t i = 0; i < g_contexts.size(); ++i) { for (size_t i = 0; i < g_contexts.size(); ++i) {
if (g_contexts[i] == nullptr) { if (g_contexts[i] == nullptr) {
g_contexts[i] = whisper_init(path_model.c_str()); g_contexts[i] = whisper_init_from_file(path_model.c_str());
if (g_contexts[i] != nullptr) { if (g_contexts[i] != nullptr) {
if (g_worker.joinable()) { if (g_worker.joinable()) {
g_worker.join(); g_worker.join();

2
examples/bench/bench.cpp
Unescape View File

@ -53,7 +53,7 @@ int main(int argc, char ** argv) {
// whisper init // whisper init
struct whisper_context * ctx = whisper_init(params.model.c_str()); struct whisper_context * ctx = whisper_init_from_file(params.model.c_str());
{ {
fprintf(stderr, "\n"); fprintf(stderr, "\n");

2
examples/command.wasm/emscripten.cpp
Unescape View File

@ -324,7 +324,7 @@ EMSCRIPTEN_BINDINGS(command) {
emscripten::function("init", emscripten::optional_override([](const std::string & path_model) { emscripten::function("init", emscripten::optional_override([](const std::string & path_model) {
for (size_t i = 0; i < g_contexts.size(); ++i) { for (size_t i = 0; i < g_contexts.size(); ++i) {
if (g_contexts[i] == nullptr) { if (g_contexts[i] == nullptr) {
g_contexts[i] = whisper_init(path_model.c_str()); g_contexts[i] = whisper_init_from_file(path_model.c_str());
if (g_contexts[i] != nullptr) { if (g_contexts[i] != nullptr) {
g_running = true; g_running = true;
if (g_worker.joinable()) { if (g_worker.joinable()) {

2
examples/command/command.cpp
Unescape View File

@ -931,7 +931,7 @@ int main(int argc, char ** argv) {
// whisper init // whisper init
struct whisper_context * ctx = whisper_init(params.model.c_str()); struct whisper_context * ctx = whisper_init_from_file(params.model.c_str());
// print some info about the processing // print some info about the processing
{ {

2
examples/main/main.cpp
Unescape View File

@ -478,7 +478,7 @@ int main(int argc, char ** argv) {
// whisper init // whisper init
struct whisper_context * ctx = whisper_init(params.model.c_str()); struct whisper_context * ctx = whisper_init_from_file(params.model.c_str());
if (ctx == nullptr) { if (ctx == nullptr) {
fprintf(stderr, "error: failed to initialize whisper context\n"); fprintf(stderr, "error: failed to initialize whisper context\n");

2
examples/stream.wasm/emscripten.cpp
Unescape View File

@ -129,7 +129,7 @@ EMSCRIPTEN_BINDINGS(stream) {
emscripten::function("init", emscripten::optional_override([](const std::string & path_model) { emscripten::function("init", emscripten::optional_override([](const std::string & path_model) {
for (size_t i = 0; i < g_contexts.size(); ++i) { for (size_t i = 0; i < g_contexts.size(); ++i) {
if (g_contexts[i] == nullptr) { if (g_contexts[i] == nullptr) {
g_contexts[i] = whisper_init(path_model.c_str()); g_contexts[i] = whisper_init_from_file(path_model.c_str());
if (g_contexts[i] != nullptr) { if (g_contexts[i] != nullptr) {
g_running = true; g_running = true;
if (g_worker.joinable()) { if (g_worker.joinable()) {

2
examples/stream/stream.cpp
Unescape View File

@ -456,7 +456,7 @@ int main(int argc, char ** argv) {
exit(0); exit(0);
} }
struct whisper_context * ctx = whisper_init(params.model.c_str()); struct whisper_context * ctx = whisper_init_from_file(params.model.c_str());
std::vector<float> pcmf32 (n_samples_30s, 0.0f); std::vector<float> pcmf32 (n_samples_30s, 0.0f);
std::vector<float> pcmf32_old(n_samples_30s, 0.0f); std::vector<float> pcmf32_old(n_samples_30s, 0.0f);

2
examples/talk.wasm/emscripten.cpp
Unescape View File

@ -271,7 +271,7 @@ EMSCRIPTEN_BINDINGS(talk) {
emscripten::function("init", emscripten::optional_override([](const std::string & path_model) { emscripten::function("init", emscripten::optional_override([](const std::string & path_model) {
for (size_t i = 0; i < g_contexts.size(); ++i) { for (size_t i = 0; i < g_contexts.size(); ++i) {
if (g_contexts[i] == nullptr) { if (g_contexts[i] == nullptr) {
g_contexts[i] = whisper_init(path_model.c_str()); g_contexts[i] = whisper_init_from_file(path_model.c_str());
if (g_contexts[i] != nullptr) { if (g_contexts[i] != nullptr) {
g_running = true; g_running = true;
if (g_worker.joinable()) { if (g_worker.joinable()) {

2
examples/talk/talk.cpp
Unescape View File

@ -498,7 +498,7 @@ int main(int argc, char ** argv) {
// whisper init // whisper init
struct whisper_context * ctx_wsp = whisper_init(params.model_wsp.c_str()); struct whisper_context * ctx_wsp = whisper_init_from_file(params.model_wsp.c_str());
// gpt init // gpt init

2
examples/whisper.android/app/src/main/jni/whisper/jni.c
Unescape View File

@ -23,7 +23,7 @@ Java_com_whispercppdemo_whisper_WhisperLib_00024Companion_initContext(
UNUSED(thiz); UNUSED(thiz);
struct whisper_context *context = NULL; struct whisper_context *context = NULL;
const char *model_path_chars = (*env)->GetStringUTFChars(env, model_path_str, NULL); const char *model_path_chars = (*env)->GetStringUTFChars(env, model_path_str, NULL);
context = whisper_init(model_path_chars); context = whisper_init_from_file(model_path_chars);
(*env)->ReleaseStringUTFChars(env, model_path_str, model_path_chars); (*env)->ReleaseStringUTFChars(env, model_path_str, model_path_chars);
return (jlong) context; return (jlong) context;
} }

2
examples/whisper.objc/whisper.objc/ViewController.m
Unescape View File

@ -61,7 +61,7 @@ void AudioInputCallback(void * inUserData,
NSLog(@"Loading model from %@", modelPath); NSLog(@"Loading model from %@", modelPath);
// create ggml context // create ggml context
stateInp.ctx = whisper_init([modelPath UTF8String]); stateInp.ctx = whisper_init_from_file([modelPath UTF8String]);
// check if the model was loaded successfully // check if the model was loaded successfully
if (stateInp.ctx == NULL) { if (stateInp.ctx == NULL) {

2
examples/whisper.swiftui/whisper.cpp.swift/LibWhisper.swift
Unescape View File

@ -55,7 +55,7 @@ actor WhisperContext {
} }
static func createContext(path: String) throws -> WhisperContext { static func createContext(path: String) throws -> WhisperContext {
let context = whisper_init(path) let context = whisper_init_from_file(path)
if let context { if let context {
return WhisperContext(context: context) return WhisperContext(context: context)
} else { } else {

2
examples/whisper.wasm/emscripten.cpp
Unescape View File

@ -18,7 +18,7 @@ EMSCRIPTEN_BINDINGS(whisper) {
for (size_t i = 0; i < g_contexts.size(); ++i) { for (size_t i = 0; i < g_contexts.size(); ++i) {
if (g_contexts[i] == nullptr) { if (g_contexts[i] == nullptr) {
g_contexts[i] = whisper_init(path_model.c_str()); g_contexts[i] = whisper_init_from_file(path_model.c_str());
if (g_contexts[i] != nullptr) { if (g_contexts[i] != nullptr) {
return i + 1; return i + 1;
} else { } else {

6
whisper.cpp
Unescape View File

@ -2232,7 +2232,7 @@ static std::vector<whisper_vocab::id> tokenize(const whisper_vocab & vocab, cons
// interface implementation // interface implementation
// //
struct whisper_context * whisper_init(const char * path_model) { struct whisper_context * whisper_init_from_file(const char * path_model) {
whisper_model_loader loader; whisper_model_loader loader;
fprintf(stderr, "%s: loading model from '%s'\n", __func__, path_model); fprintf(stderr, "%s: loading model from '%s'\n", __func__, path_model);
@ -2260,10 +2260,10 @@ struct whisper_context * whisper_init(const char * path_model) {
fin->close(); fin->close();
}; };
return whisper_init_loader(&loader); return whisper_init(&loader);
} }
struct whisper_context * whisper_init_loader(struct whisper_model_loader * loader) { struct whisper_context * whisper_init(struct whisper_model_loader * loader) {
ggml_time_init(); ggml_time_init();
whisper_context * ctx = new whisper_context; whisper_context * ctx = new whisper_context;

6
whisper.h
Unescape View File

@ -40,7 +40,7 @@ extern "C" {
// //
// ... // ...
// //
// struct whisper_context * ctx = whisper_init("/path/to/ggml-base.en.bin"); // struct whisper_context * ctx = whisper_init_from_file("/path/to/ggml-base.en.bin");
// //
// if (whisper_full(ctx, wparams, pcmf32.data(), pcmf32.size()) != 0) { // if (whisper_full(ctx, wparams, pcmf32.data(), pcmf32.size()) != 0) {
// fprintf(stderr, "failed to process audio\n"); // fprintf(stderr, "failed to process audio\n");
@ -94,8 +94,8 @@ extern "C" {
// Allocates all memory needed for the model and loads the model from the given file. // Allocates all memory needed for the model and loads the model from the given file.
// Returns NULL on failure. // Returns NULL on failure.
WHISPER_API struct whisper_context * whisper_init(const char * path_model); WHISPER_API struct whisper_context * whisper_init_from_file(const char * path_model);
WHISPER_API struct whisper_context * whisper_init_loader(struct whisper_model_loader * loader); WHISPER_API struct whisper_context * whisper_init(struct whisper_model_loader * loader);
// Frees all memory allocated by the model. // Frees all memory allocated by the model.
WHISPER_API void whisper_free(struct whisper_context * ctx); WHISPER_API void whisper_free(struct whisper_context * ctx);

Write Preview
Loading…
Cancel
Save