Skip to content

C
coderai
Commit 544896de authored by Your Name's avatar Your Name
Browse files
Options

Force manual formatting when tools are present to avoid Jinja errors

parent 562d5df5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
coderai
View file @ 544896de
...@@ -2225,6 +2225,7 @@ class VulkanBackend(ModelBackend): ...@@ -2225,6 +2225,7 @@ class VulkanBackend(ModelBackend):
use_manual = self.chat_template in ("unknown", "jinja_fallback", None) use_manual = self.chat_template in ("unknown", "jinja_fallback", None)
# With tools, use manual for non-default templates but let llama.cpp handle "default" (embedded GGUF template) # With tools, use manual for non-default templates but let llama.cpp handle "default" (embedded GGUF template)
use_manual = use_manual or (tools is not None and self.chat_template != "default") use_manual = use_manual or (tools is not None and self.chat_template != "default")
use_manual = use_manual or (tools is not None) # Force manual when tools present to avoid Jinja errors
# Also use manual when we have a known template but no HuggingFace tokenizer (except for embedded "default") # Also use manual when we have a known template but no HuggingFace tokenizer (except for embedded "default")
use_manual = use_manual or (self.chat_template is not None and self.chat_template != "default" and self.hf_tokenizer is None) use_manual = use_manual or (self.chat_template is not None and self.chat_template != "default" and self.hf_tokenizer is None)
use_hf = self.hf_tokenizer is not None use_hf = self.hf_tokenizer is not None
...@@ -2315,6 +2316,7 @@ class VulkanBackend(ModelBackend): ...@@ -2315,6 +2316,7 @@ class VulkanBackend(ModelBackend):
use_manual = self.chat_template in ("unknown", "jinja_fallback", None) use_manual = self.chat_template in ("unknown", "jinja_fallback", None)
# With tools, use manual for non-default templates but let llama.cpp handle "default" (embedded GGUF template) # With tools, use manual for non-default templates but let llama.cpp handle "default" (embedded GGUF template)
use_manual = use_manual or (tools is not None and self.chat_template != "default") use_manual = use_manual or (tools is not None and self.chat_template != "default")
use_manual = use_manual or (tools is not None) # Force manual when tools present to avoid Jinja errors
# Also use manual when we have a known template but no HuggingFace tokenizer (except for embedded "default") # Also use manual when we have a known template but no HuggingFace tokenizer (except for embedded "default")
use_manual = use_manual or (self.chat_template is not None and self.chat_template != "default" and self.hf_tokenizer is None) use_manual = use_manual or (self.chat_template is not None and self.chat_template != "default" and self.hf_tokenizer is None)
use_hf = self.hf_tokenizer is not None use_hf = self.hf_tokenizer is not None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment