Repository navigation
chore(ggml): replace freetoken.patch with the llama.cpp pin - #873
Merged
Merged
Conversation
The patch repeats every edit to a copied file and nothing checks that the two agree. The pin and the tree reproduce it. scripts/sync-llama-cpp.sh diffs the copy against the pin and merges a newer llama.cpp from it, and docs/ggml-kernels.md says how to maintain the copy.
pretor
pushed a commit
to pretor/FreeToken
that referenced
this pull request
Nov 6, 2026
KarrAcaRn
pushed a commit
to KarrAcaRn/FreeToken-ByAI
that referenced
this pull request
Nov 7, 2026
Upstream 14119b8 (FlashML-org#860 FlashML-org#867 FlashML-org#868 FlashML-org#872 FlashML-org#873 FlashML-org#866 FlashML-org#874 FlashML-org#871). Conflicts: - server/generation.py, server/openai_api.py: upstream FlashML-org#868 moves the stream token counts into GenUsage (continuous_usage_stats). Kept next's GenTimer/gen_timings, chat logprobs and the n>1 completion fan-out (FlashML-org#843) and moved their counters onto GenUsage, so continuous usage also covers every choice of a fanned-out completion stream; the metrics block reads the same GenUsage. - tests/server/test_openai_api.py: FlashML-org#868's completions case called stream_completion_chunks(uid, ...); on next it goes through handle_completion, which builds the fan-out. - docs/models.md: upstream's Ripple row and GGUF table, next's Flint link. - README.md: next's fork overview. Assisted-by: Claude Opus 5.5
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.
Drop
freetoken.patchfrom the vendored ggml and gguf-py code, since diffing the llama.cpp pin against the tree reproduces it, and addscripts/sync-llama-cpp.shanddocs/ggml-kernels.mdfor maintaining the copy.