llama: consistent ctx <-> buf order for KV cache #16746
Open
+38
−32
Conversation
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
JohannesGaessler
requested review from
CISC,
ggerganov and
slaren
as code owners
github-actions
bot
added
the
ggml
slaren
reviewed
Oct 23, 2025
ggml/include/ggml-cpp.h
Outdated
Comment on lines
43
to
49
| // define a comparator for the buft -> ctx map to ensure that the order is well-defined: | ||
| struct ggml_backend_buft_comparator { | ||
| bool operator()(const ggml_backend_buffer_type_t & lhs, const ggml_backend_buffer_type_t & rhs) const { | ||
| return ggml_backend_buft_name(lhs) < ggml_backend_buft_name(rhs); | ||
| } | ||
| }; | ||
| typedef std::map<ggml_backend_buffer_type_t, ggml_context_ptr, ggml_backend_buft_comparator> buft_ctx_map_t; |
There was a problem hiding this comment.
This should not be in a public header.
JohannesGaessler
force-pushed
the
llama-kv-cache-fix-ctx-order
branch
from
f355522 to
7c179ab
Compare
JohannesGaessler
force-pushed
the
llama-kv-cache-fix-ctx-order
branch
from
7c179ab to
41deb58
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
See #16581 . The KV cache has the same issue which can lead to incorrect results for #16653 .