]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
`sampler`: fixes trigger tokens + lazy grammars (fix typo cast from token to string...
authorOlivier Chafik <redacted>
Mon, 10 Mar 2025 09:44:42 +0000 (09:44 +0000)
committerGitHub <redacted>
Mon, 10 Mar 2025 09:44:42 +0000 (09:44 +0000)
* Fix typo in lazy grammar handling (fixes trigger tokens)

Co-authored-by: Georgi Gerganov <redacted>
---------

Co-authored-by: Georgi Gerganov <redacted>
examples/server/server.cpp

index 8386f4eebba48848289e938cd0d02da6a21d46c3..aec8b9eed05c0e797175447d5db4c9930fbba7f1 100644 (file)
@@ -384,8 +384,9 @@ struct server_task {
                             SRV_DBG("Grammar trigger token: %d (`%s`)\n", token, word.c_str());
                             common_grammar_trigger trigger;
                             trigger.type = COMMON_GRAMMAR_TRIGGER_TYPE_TOKEN;
-                            trigger.value = (llama_token) token;
-                            params.sampling.grammar_triggers.push_back(trigger);
+                            trigger.value = word;
+                            trigger.token = token;
+                            params.sampling.grammar_triggers.push_back(std::move(trigger));
                         } else {
                             SRV_DBG("Grammar trigger word: `%s`\n", word.c_str());
                             params.sampling.grammar_triggers.push_back({COMMON_GRAMMAR_TRIGGER_TYPE_WORD, word});