Merge branch 'upstream' into concedo_experimental

# Conflicts: # .github/workflows/build-vulkan.yml # .github/workflows/docker.yml # embd_res/templates/google-gemma-4-31B-it-interleaved.jinja # embd_res/templates/google-gemma-4-31B-it.jinja # tests/test-chat.cpp
2026-09-19 01:05:09 +02:00 · 2026-04-05 18:46:23 +08:00
parent e555b16549 c08d28d088
commit 9b1f1bbf35
10 changed files with 446 additions and 399 deletions
@@ -2791,6 +2791,7 @@ void llama_vocab::impl::load(llama_model_loader & ml, const LLM_KV & kv) {
                    || t.first == "<end_of_utterance>" // smoldocling
                    || t.first == "<eos>" // kcpp: added for gemma4
                    || t.first == "<turn|>" // gemma4
+                    || t.first == "<|tool_response>" // gemma4
                    || t.first == "<｜end▁of▁sentence｜>" // deepseek-ocr
               ) {
                special_eog_ids.insert(t.second);