From ed0d6372a025a80eb16fc8fa851d0714d3bbf744 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Thu, 22 Dec 2022 17:05:19 +0200 Subject: [PATCH] minor : switch case always break --- ggml.c | 20 ++++++++++---------- whisper.cpp | 4 +++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ggml.c b/ggml.c index 1cc656c..73b0694 100644 --- a/ggml.c +++ b/ggml.c @@ -1904,27 +1904,27 @@ int32_t ggml_get_i32_1d(const struct ggml_tensor * tensor, int i) { { GGML_ASSERT(tensor->nb[0] == sizeof(int8_t)); return ((int8_t *)(tensor->data))[i]; - } + } break; case GGML_TYPE_I16: { GGML_ASSERT(tensor->nb[0] == sizeof(int16_t)); return ((int16_t *)(tensor->data))[i]; - } + } break; case GGML_TYPE_I32: { GGML_ASSERT(tensor->nb[0] == sizeof(int32_t)); return ((int32_t *)(tensor->data))[i]; - } + } break; case GGML_TYPE_F16: { GGML_ASSERT(tensor->nb[0] == sizeof(ggml_fp16_t)); return GGML_FP16_TO_FP32(((ggml_fp16_t *)(tensor->data))[i]); - } + } break; case GGML_TYPE_F32: { GGML_ASSERT(tensor->nb[0] == sizeof(float)); return ((float *)(tensor->data))[i]; - } + } break; case GGML_TYPE_COUNT: { GGML_ASSERT(false); @@ -1974,27 +1974,27 @@ float ggml_get_f32_1d(const struct ggml_tensor * tensor, int i) { { GGML_ASSERT(tensor->nb[0] == sizeof(int8_t)); return ((int8_t *)(tensor->data))[i]; - } + } break; case GGML_TYPE_I16: { GGML_ASSERT(tensor->nb[0] == sizeof(int16_t)); return ((int16_t *)(tensor->data))[i]; - } + } break; case GGML_TYPE_I32: { GGML_ASSERT(tensor->nb[0] == sizeof(int32_t)); return ((int32_t *)(tensor->data))[i]; - } + } break; case GGML_TYPE_F16: { GGML_ASSERT(tensor->nb[0] == sizeof(ggml_fp16_t)); return GGML_FP16_TO_FP32(((ggml_fp16_t *)(tensor->data))[i]); - } + } break; case GGML_TYPE_F32: { GGML_ASSERT(tensor->nb[0] == sizeof(float)); return ((float *)(tensor->data))[i]; - } + } break; case GGML_TYPE_COUNT: { GGML_ASSERT(false); diff --git a/whisper.cpp b/whisper.cpp index b0d223e..76fcd30 100644 --- a/whisper.cpp +++ b/whisper.cpp @@ -2251,7 +2251,9 @@ void whisper_free(struct whisper_context * ctx) { if (ctx->model.ctx_mem) { ggml_free(ctx->model.ctx_mem); } - delete ctx->buf_model; + if (ctx->buf_model) { + delete ctx->buf_model; + } delete ctx; } }