sync: update ggml (#1082)

catap · web-flow · commit 614f8736df54 · 2025-12-14T01:23:34.000+08:00
diff --git a/ggml b/ggml
@@ -1 +1 @@
-Subproject commit 2d3876d554551d35c06dccc5852be50d5fd2a275
+Subproject commit f5425c0ee5e582a7d64411f06139870bff3e52e0
diff --git a/ggml_extend.hpp b/ggml_extend.hpp
@@ -1270,13 +1270,17 @@ __STATIC_INLINE__ struct ggml_tensor* ggml_ext_attention_ext(struct ggml_context
         }
 
         if (mask_in != nullptr) {
+            // the need for padding got removed in ggml 4767bda
+            // ensure we can still use the old version for now
+#ifdef GGML_KQ_MASK_PAD
             int mask_pad = 0;
             if (mask_in->ne[1] % GGML_KQ_MASK_PAD != 0) {
                 mask_pad = GGML_PAD(L_q, GGML_KQ_MASK_PAD) - mask_in->ne[1];
             }
             if (mask_pad > 0) {
                 mask_in = ggml_pad(ctx, mask_in, 0, mask_pad, 0, 0);
             }
+#endif
             mask_in = ggml_cast(ctx, mask_in, GGML_TYPE_F16);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1270,13 +1270,17 @@ __STATIC_INLINE__ struct ggml_tensor* ggml_ext_attention_ext(struct ggml_context`
`1270`	`1270`	`}`
`1271`	`1271`
`1272`	`1272`	`if (mask_in != nullptr) {`
	`1273`	`+ // the need for padding got removed in ggml 4767bda`
	`1274`	`+ // ensure we can still use the old version for now`
	`1275`	`+#ifdef GGML_KQ_MASK_PAD`
`1273`	`1276`	`int mask_pad = 0;`
`1274`	`1277`	`if (mask_in->ne[1] % GGML_KQ_MASK_PAD != 0) {`
`1275`	`1278`	`mask_pad = GGML_PAD(L_q, GGML_KQ_MASK_PAD) - mask_in->ne[1];`
`1276`	`1279`	`}`
`1277`	`1280`	`if (mask_pad > 0) {`
`1278`	`1281`	`mask_in = ggml_pad(ctx, mask_in, 0, mask_pad, 0, 0);`
`1279`	`1282`	`}`
	`1283`	`+#endif`
`1280`	`1284`	`mask_in = ggml_cast(ctx, mask_in, GGML_TYPE_F16);`
`1281`	`1285`	`}`
`1282`	`1286`