Merge branch 'main' into nightly

This commit is contained in:
Daniel Han 2025-05-17 05:10:00 -07:00
commit 4155d4a9de
2 changed files with 3 additions and 3 deletions

View file

@ -1029,7 +1029,7 @@ qwen3_template = \
{{- "\n" }}
{{- tool | tojson }}
{%- endfor %}
{{- "\n</tools>\n\nFor each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:\n<tool_call>\n{\"name\": <function-name>, \"arguments\": <args-json-object>}\n</tool_call><|im_end|>\n" }}
{{- "\n</tools>\n\nFor each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:\n<tool_call>\n{\\"name\\": <function-name>, \\"arguments\\": <args-json-object>}\n</tool_call><|im_end|>\n" }}
{%- else %}
{%- if messages[0].role == 'system' %}
{{- '<|im_start|>system\n' + messages[0].content + '<|im_end|>\n' }}

View file

@ -1731,7 +1731,7 @@ class FastLlamaModel:
except: pass
has_rope_scaling = True
# If max_seq_length is not specified, use maximum fron config
# If max_seq_length is not specified, use maximum from config
if max_seq_length is None:
max_seq_length = model_max_seq_length
pass
@ -1753,7 +1753,7 @@ class FastLlamaModel:
# Warn RoPE scaling isn't allowed
if not has_rope_scaling:
raise RuntimeError(
"However, {model_name} doesn't support RoPE Scaling!\n"\
f"However, {model_name} doesn't support RoPE Scaling!\n"\
"Please file a feature request at https://github.com/unslothai/unsloth."
)
pass