From 8bb8d40fe0718d509ec3c0ba9406da901501b609 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Mon, 20 Nov 2023 13:16:11 +0200 Subject: [PATCH] whisper : reuse whisper_decode_with_state (#1521) --- whisper.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/whisper.cpp b/whisper.cpp index 454773bae40..8f457239e64 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) {