ggml : minor naming changes #8433
Merged
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
github-actions
bot
added
testing
ggml-ci
ggerganov
force-pushed
the
gg/ggml-naming
branch
from
ffabf83 to
8229ee5
Compare
JohannesGaessler
approved these changes
Jul 11, 2024
| GGML_API GGML_CALL int ggml_blck_size(enum ggml_type type); | ||
| GGML_API GGML_CALL size_t ggml_type_size(enum ggml_type type); // size in bytes for all elements in a block | ||
| GGML_API GGML_CALL size_t ggml_row_size (enum ggml_type type, int64_t ne); // size in bytes for all elements in a row | ||
| GGML_API GGML_CALL int64_t ggml_blck_size(enum ggml_type type); |
Collaborator
There was a problem hiding this comment.
This is more than just a name change but returning a larger integer should be safe I think.
ggml/src/ggml.c
Outdated
| if (ne % ggml_blck_size(info->type) != 0) { | ||
| fprintf(stderr, "%s: tensor '%s' of type %d (%s) number of elements (%" PRId64 ") is not a multiple of block size (%d)\n", | ||
| __func__, info->name.data, (int)info->type, ggml_type_name(info->type), ne, ggml_blck_size(info->type)); | ||
| __func__, info->name.data, (int) info->type, ggml_type_name(info->type), ne, (int) ggml_blck_size(info->type)); |
Collaborator
There was a problem hiding this comment.
Instead of casting to int I think it would be better to use the PRId64 macro like ne does.
ggml/src/ggml.c
Outdated
Comment on lines
15201
to
15202
| enum ggml_type const kq_vec_dot_type = type_traits[k->type].vec_dot_type; | ||
| ggml_from_float_t const kq_from_float = type_traits[kq_vec_dot_type].from_float; |
Collaborator
There was a problem hiding this comment.
My personal opinion is that the old names were better because kq_ as a prefix is ambiguous but I don't really care either way.
Member
Author
There was a problem hiding this comment.
Thanks for taking a look - changed back to the original names
arthw
pushed a commit
to arthw/llama.cpp
that referenced
this pull request
Jul 13, 2024
* ggml : minor naming changes ggml-ci * ggml : use PRId64 [no ci] * ggml : revert FA K/Q names
arthw
pushed a commit
to arthw/llama.cpp
that referenced
this pull request
Jul 13, 2024
* ggml : minor naming changes ggml-ci * ggml : use PRId64 [no ci] * ggml : revert FA K/Q names
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.
copilot:all