Merge branch 'master' into concedo_experimental

2026-09-19 01:05:09 +02:00 · 2023-12-01 23:48:20 +08:00
parent 4f40c226a0 8d6d9f033b
commit 495bb3ab1e
9 changed files with 314 additions and 196 deletions
@@ -1289,6 +1289,14 @@ extern "C" {
            struct ggml_context * ctx,
            struct ggml_tensor  * a);

+    // fused soft_max(a*scale + mask)
+    // mask is optional
+    GGML_API struct ggml_tensor * ggml_soft_max_ext(
+            struct ggml_context * ctx,
+            struct ggml_tensor  * a,
+            struct ggml_tensor  * mask,
+            float                 scale);
+
    GGML_API struct ggml_tensor * ggml_soft_max_back(
            struct ggml_context * ctx,
            struct ggml_tensor  * a,