From: Georgi Gerganov <redacted>
Date: Mon, 21 Oct 2024 13:20:46 +0000 (+0300)
Subject: ggml : add asserts for type conversion in fattn kernels (llama/9971)
X-Git-Tag: upstream/1.7.4~290
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=741c138aa1586335120b5115b6f09ca496a6da6c;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

ggml : add asserts for type conversion in fattn kernels (llama/9971)

ggml-ci
---

diff --git a/ggml/src/ggml.c b/ggml/src/ggml.c
index 649b1094..9e428001 100644
--- a/ggml/src/ggml.c
+++ b/ggml/src/ggml.c
@@ -325,8 +325,9 @@ struct ggml_logger_state {
 static struct ggml_logger_state g_logger_state = {ggml_log_callback_default, NULL};
 
 static void ggml_log_internal_v(enum ggml_log_level level, const char * format, va_list args) {
-    if (format == NULL)
+    if (format == NULL) {
         return;
+    }
     va_list args_copy;
     va_copy(args_copy, args);
     char buffer[128];
@@ -15690,6 +15691,9 @@ static void ggml_compute_forward_flash_attn_ext_f16(
     ggml_vec_dot_t    const kq_vec_dot     = type_traits[k->type].vec_dot;
     ggml_to_float_t   const v_to_float     = type_traits[v->type].to_float;
 
+    GGML_ASSERT(q_to_vec_dot && "fattn: unsupported K-type");
+    GGML_ASSERT(v_to_float   && "fattn: unsupported V-type");
+
     // loop over n_batch and n_head
     for (int ir = ir0; ir < ir1; ++ir) {
         // q indices