Conversation
…357) * chat: fix int overflow, prevent size calculation in float/double * Update common/chat.cpp Co-authored-by: Georgi Gerganov <ggerganov@gmail.com> --------- Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
# Conflicts: # common/chat.cpp
ikawrakow
approved these changes
Dec 15, 2025
Contributor
|
Seems this PR revert some of the fix for Kimi-K2 tool call: ik_llama.cpp/common/chat-parser.cpp Lines 914 to 930 in f506f5d |
Collaborator
Author
|
#1070 |
Owner
|
@firecoperana This PR completely bricks in my terminal, instead of just seeing the output of the model. Can you fix it? |
Collaborator
Author
|
Yes, maybe it's the log file I changed. |
Collaborator
Author
|
Does #1071 fix for you? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR refactors chat.cpp and server.cpp for better readability and faster compilation. In my test, it reduced 15s of compile time for my machine. It also ports log function from mainline. Didn't modify any existing log functions, but for future ports, we can use new log functions.
For chat.cpp, move all common_chat_parse_* to chat-parser.cpp
For server.cpp, split server.cpp code into server/common/task/queue/context files.
Some other minor changes like ggml-org/llama.cpp#17738 and ggml-org/llama.cpp#17357
Should not cause any regression.