Merge branch 'upstream' into concedo_experimental

2026-09-19 17:25:07 +02:00 · 2025-04-08 21:46:30 +08:00
parent 26e1653255 1d343b4069
commit ebf924c5d1
25 changed files with 672 additions and 73 deletions
@@ -112,6 +112,7 @@ extern "C" {
        LLAMA_VOCAB_PRE_TYPE_SUPERBPE       = 30,
        LLAMA_VOCAB_PRE_TYPE_TRILLION       = 31,
        LLAMA_VOCAB_PRE_TYPE_BAILINGMOE     = 32,
+        LLAMA_VOCAB_PRE_TYPE_LLAMA4         = 33,
    };

    enum llama_rope_type {