whisper : minor OpenVINO refactoring (#1037)

Hopefully I didn't break something - haven't tested

diff --git a/examples/common.cpp b/examples/common.cpp
index 960656def7aa9707793fbeef275d69fd14d04cbd..7d215ae1fd61d1ac26bed2139b6f3c12ca1be7f0 100644 (file)
--- a/examples/common.cpp
+++ b/examples/common.cpp
@@ -47,6 +47,11 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
             params.n_batch = std::stoi(argv[++i]);
         } else if (arg == "-m" || arg == "--model") {
             params.model = argv[++i];
+        } else if (arg == "-i" || arg == "--interactive") {
+            params.interactive = true;
+        } else if (arg == "-ip" || arg == "--interactive-port") {
+            params.interactive = true;
+            params.interactive_port = std::stoi(argv[++i]);
         } else if (arg == "-h" || arg == "--help") {
             gpt_print_usage(argc, argv, params);
             exit(0);

diff --git a/examples/common.h b/examples/common.h
index 12b2b339d670533476d5c3e8acfab140db04c0bb..f9740a3c3d8e1c8fb989a74e184f5a0c2b40060c 100644 (file)
--- a/examples/common.h
+++ b/examples/common.h
@@ -15,22 +15,24 @@
 //
 
 struct gpt_params {
-    int32_t seed      = -1; // RNG seed
+    int32_t seed      = -1;  // RNG seed
     int32_t n_threads = std::min(4, (int32_t) std::thread::hardware_concurrency());
     int32_t n_predict = 200; // new tokens to predict
+    int32_t n_batch   = 8;   // batch size for prompt processing
 
     // sampling parameters
-    int32_t top_k = 40;
-    float   top_p = 0.9f;
-    float   temp  = 0.9f;
+    int32_t top_k          = 40;
+    float   top_p          = 0.9f;
+    float   temp           = 0.9f;
     int32_t repeat_last_n  = 64;
     float   repeat_penalty = 1.00f;
 
-    int32_t n_batch = 8; // batch size for prompt processing
-
     std::string model      = "models/gpt-2-117M/ggml-model.bin"; // model path
     std::string prompt     = "";
     std::string token_test = "";
+
+    bool    interactive      = false;
+    int32_t interactive_port = -1;
 };
 
 bool gpt_params_parse(int argc, char ** argv, gpt_params & params);

diff --git a/examples/main/main.cpp b/examples/main/main.cpp
index 9a68367186de535f9ea9cd881ffda69687790817..8dd31d028b1e732bf6572230dab0fd8cc835d721 100644 (file)
--- a/examples/main/main.cpp
+++ b/examples/main/main.cpp
@@ -813,7 +813,7 @@ int main(int argc, char ** argv) {
         return 3;
     }
 
-    // initialize openvino encoder. This has no effect on whisper.cpp builds that don't have OpenVINO configured.
+    // initialize openvino encoder. this has no effect on whisper.cpp builds that don't have OpenVINO configured
     whisper_ctx_init_openvino_encoder(ctx, nullptr, params.openvino_encode_device.c_str(), nullptr);
 
     for (int f = 0; f < (int) params.fname_inp.size(); ++f) {

diff --git a/whisper.cpp b/whisper.cpp
index 19b43b5193f75b9892ca5359a466b9c31dd46eab..381874573ea48a9a7ee307c4e6a00711241be728 100644 (file)
--- a/whisper.cpp
+++ b/whisper.cpp
@@ -2654,7 +2654,7 @@ static std::string whisper_get_coreml_path_encoder(std::string path_bin) {
 
 #ifdef WHISPER_USE_OPENVINO
 // replace .bin with-encoder-openvino.xml
-static std::string whisper_get_openvino_path_encoder(std::string path_bin) {
+static std::string whisper_openvino_get_path_encoder(std::string path_bin) {
     auto pos = path_bin.rfind('.');
     if (pos != std::string::npos) {
         path_bin = path_bin.substr(0, pos);
@@ -2665,7 +2665,7 @@ static std::string whisper_get_openvino_path_encoder(std::string path_bin) {
     return path_bin;
 }
 
-static std::string whisper_get_openvino_path_cache(std::string path_bin) {
+static std::string whisper_openvino_get_path_cache(std::string path_bin) {
     auto pos = path_bin.rfind('.');
     if (pos != std::string::npos) {
         path_bin = path_bin.substr(0, pos);
@@ -2743,55 +2743,52 @@ struct whisper_state * whisper_init_state(whisper_context * ctx) {
     return state;
 }
 
-int whisper_ctx_init_openvino_encoder(struct whisper_context* ctx,
-    const char* openvino_model_path,
-    const char* openvino_device,
-    const char* openvino_cache_dir)
-{
+int whisper_ctx_init_openvino_encoder(
+        struct whisper_context * ctx,
+                    const char * model_path,
+                    const char * device,
+                    const char * cache_dir) {
 #ifndef WHISPER_USE_OPENVINO
     (void)(ctx);
-    (void)(openvino_model_path);
-    (void)(openvino_device);
-    (void)(openvino_cache_dir);
-    return 0;
+    (void)(model_path);
+    (void)(device);
+    (void)(cache_dir);
+
+    return 1;
 #else
-    if (!openvino_model_path && ctx->path_model.empty())
-    {
-        fprintf(stderr, "%s: openvino_model_path is nullptr, and ctx has no model_path set.\n", __func__);
-        return 0;
+    if (!model_path && ctx->path_model.empty()) {
+        fprintf(stderr, "%s: model_path is nullptr, and ctx has no model_path set.\n", __func__);
+        return 1;
     }
 
-    std::string path_openvino;
-    if (!openvino_model_path) {
-        //if openvino_model_path is not set, attempt to find it in the same directory as ggml-<model>.bin model
-        path_openvino = whisper_get_openvino_path_encoder(ctx->path_model);
-    }
-    else {
-        path_openvino = openvino_model_path;
+    std::string path_encoder;
+    if (!model_path) {
+        //if model_path is not set, attempt to find it in the same directory as ggml-<model>.bin model
+        path_encoder = whisper_openvino_get_path_encoder(ctx->path_model);
+    } else {
+        path_encoder = model_path;
     }
 
-    std::string path_openvino_cache_dir;
-    if (!openvino_cache_dir) {
-        //if openvino_cache_dir is not set, set it as a dir residing next to ggml-<model>.bin
-        path_openvino_cache_dir = whisper_get_openvino_path_cache(ctx->path_model);
-    }
-    else {
-        path_openvino_cache_dir = openvino_cache_dir;
+    std::string path_cache;
+    if (!cache_dir) {
+        //if cache_dir is not set, set it as a dir residing next to ggml-<model>.bin
+        path_cache = whisper_openvino_get_path_cache(ctx->path_model);
+    } else {
+        path_cache = cache_dir;
     }
 
-    fprintf(stderr, "%s: loading OpenVINO model from '%s'\n", __func__, path_openvino.c_str());
+    fprintf(stderr, "%s: loading OpenVINO model from '%s'\n", __func__, path_encoder.c_str());
     fprintf(stderr, "%s: first run on a device may take a while ...\n", __func__);
 
-    ctx->state->ctx_openvino = whisper_openvino_init(path_openvino.c_str(), openvino_device, path_openvino_cache_dir.c_str());
+    ctx->state->ctx_openvino = whisper_openvino_init(path_encoder.c_str(), device, path_cache.c_str());
     if (!ctx->state->ctx_openvino) {
-        fprintf(stderr, "%s: failed to init OpenVINO encoder from '%s'\n", __func__, path_openvino.c_str());
-        return 0;
-    }
-    else {
+        fprintf(stderr, "%s: failed to init OpenVINO encoder from '%s'\n", __func__, path_encoder.c_str());
+        return 1;
+    } else {
         fprintf(stderr, "%s: OpenVINO model loaded\n", __func__);
     }
 
-    return 1;
+    return 0;
 #endif
 }
 

diff --git a/whisper.h b/whisper.h
index 103581c74c6036bd68e8390a4b3ab2bc9c29e5cc..83af11bd848c66ff1fd6b5c9e97eec6f1484165d 100644 (file)
--- a/whisper.h
+++ b/whisper.h
@@ -120,8 +120,7 @@ extern "C" {
     // cache_dir: Optional cache directory that can speed up init time, especially for
     //                     GPU, by caching compiled 'blobs' there.
     //                     Set to nullptr if not used.
-    // Returns 1 on success. If OpenVINO is not enabled in build, this
-    // simply returns 0.
+    // Returns 0 on success. If OpenVINO is not enabled in build, this simply returns 1.
     WHISPER_API int whisper_ctx_init_openvino_encoder(
         struct whisper_context * ctx,
                     const char * model_path,