From: Georgi Gerganov <redacted>
Date: Mon, 20 Nov 2023 11:16:11 +0000 (+0200)
Subject: whisper : reuse whisper_decode_with_state (#1521)
X-Git-Tag: upstream/1.7.4~1244
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=8159a9ab993455e9f5b8124de79fa77c695b8fb5;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

whisper : reuse whisper_decode_with_state (#1521)
---

diff --git a/whisper.cpp b/whisper.cpp
index 454773ba..8f457239 100644
--- a/whisper.cpp
+++ b/whisper.cpp
@@ -3538,19 +3538,10 @@ int whisper_decode_with_state(struct whisper_context * ctx, struct whisper_state
 int whisper_decode(struct whisper_context * ctx, const whisper_token * tokens, int n_tokens, int n_past, int n_threads) {
     if (ctx->state == nullptr) {
         WHISPER_LOG_ERROR("%s: ERROR state was not loaded.\n", __func__);
-        return false;
-    }
-
-    whisper_kv_cache_seq_rm(ctx->state->kv_self, 0, n_past, -1);
-
-    whisper_batch_prep_legacy(ctx->state->batch, tokens, n_tokens, n_past, 0);
-
-    if (!whisper_decode_internal(*ctx, *ctx->state, ctx->state->batch, n_threads, nullptr, nullptr)) {
-        WHISPER_LOG_ERROR("%s: failed to eval\n", __func__);
-        return 1;
+        return -1;
     }
 
-    return 0;
+    return whisper_decode_with_state(ctx, ctx->state, tokens, n_tokens, n_past, n_threads);
 }
 
 int whisper_tokenize(struct whisper_context * ctx, const char * text, whisper_token * tokens, int n_max_tokens) {