Skip to content

llama : update API names to use correct prefix #11174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 11, 2025

Conversation

ggerganov
Copy link
Member

target #11110

Improve name consistency of the public API.

    // before
    LLAMA_API int32_t llama_n_ctx_train(const struct llama_model * model);
    LLAMA_API int32_t llama_n_embd     (const struct llama_model * model);
    LLAMA_API int32_t llama_n_layer    (const struct llama_model * model);
    LLAMA_API int32_t llama_n_head     (const struct llama_model * model);

    LLAMA_API int32_t llama_n_vocab    (const struct llama_vocab * vocab);

    // after
    LLAMA_API int32_t llama_model_n_ctx_train(const struct llama_model * model);
    LLAMA_API int32_t llama_model_n_embd     (const struct llama_model * model);
    LLAMA_API int32_t llama_model_n_layer    (const struct llama_model * model);
    LLAMA_API int32_t llama_model_n_head     (const struct llama_model * model);

    LLAMA_API int32_t llama_vocab_n_vocab    (const struct llama_vocab * vocab);

@github-actions github-actions bot added testing Everything test related android Issues specific to Android examples server labels Jan 10, 2025
@ggerganov ggerganov marked this pull request as ready for review January 10, 2025 13:55
@ggerganov ggerganov requested a review from ngxson as a code owner January 10, 2025 13:55
@ggerganov ggerganov merged commit 6df37bc into gg/llama-refactor-7 Jan 11, 2025
1 check passed
@ggerganov ggerganov deleted the gg/llama-refactor-11 branch January 11, 2025 14:41
ggerganov added a commit that referenced this pull request Jan 12, 2025
ggerganov added a commit that referenced this pull request Jan 12, 2025
* llama : functions -> methods (#11110)

* llama : add struct llama_vocab to the API (#11156)

ggml-ci

* hparams : move vocab params to llama_vocab (#11159)

ggml-ci

* vocab : more pimpl (#11165)

ggml-ci

* vocab : minor tokenization optimizations (#11160)

ggml-ci

Co-authored-by: Diego Devesa <slarengh@gmail.com>

* lora : update API names (#11167)

ggml-ci

* llama : update API names to use correct prefix (#11174)

* llama : update API names to use correct prefix

ggml-ci

* cont

ggml-ci

* cont

ggml-ci

* minor [no ci]

* vocab : llama_vocab_add_[be]os -> llama_vocab_get_add_[be]os (#11174)

ggml-ci

* vocab : llama_vocab_n_vocab -> llama_vocab_n_tokens (#11174)

ggml-ci

---------

Co-authored-by: Diego Devesa <slarengh@gmail.com>
tinglou pushed a commit to tinglou/llama.cpp that referenced this pull request Feb 13, 2025
* llama : functions -> methods (ggml-org#11110)

* llama : add struct llama_vocab to the API (ggml-org#11156)

ggml-ci

* hparams : move vocab params to llama_vocab (ggml-org#11159)

ggml-ci

* vocab : more pimpl (ggml-org#11165)

ggml-ci

* vocab : minor tokenization optimizations (ggml-org#11160)

ggml-ci

Co-authored-by: Diego Devesa <slarengh@gmail.com>

* lora : update API names (ggml-org#11167)

ggml-ci

* llama : update API names to use correct prefix (ggml-org#11174)

* llama : update API names to use correct prefix

ggml-ci

* cont

ggml-ci

* cont

ggml-ci

* minor [no ci]

* vocab : llama_vocab_add_[be]os -> llama_vocab_get_add_[be]os (ggml-org#11174)

ggml-ci

* vocab : llama_vocab_n_vocab -> llama_vocab_n_tokens (ggml-org#11174)

ggml-ci

---------

Co-authored-by: Diego Devesa <slarengh@gmail.com>
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Feb 26, 2025
* llama : functions -> methods (ggml-org#11110)

* llama : add struct llama_vocab to the API (ggml-org#11156)

ggml-ci

* hparams : move vocab params to llama_vocab (ggml-org#11159)

ggml-ci

* vocab : more pimpl (ggml-org#11165)

ggml-ci

* vocab : minor tokenization optimizations (ggml-org#11160)

ggml-ci

Co-authored-by: Diego Devesa <slarengh@gmail.com>

* lora : update API names (ggml-org#11167)

ggml-ci

* llama : update API names to use correct prefix (ggml-org#11174)

* llama : update API names to use correct prefix

ggml-ci

* cont

ggml-ci

* cont

ggml-ci

* minor [no ci]

* vocab : llama_vocab_add_[be]os -> llama_vocab_get_add_[be]os (ggml-org#11174)

ggml-ci

* vocab : llama_vocab_n_vocab -> llama_vocab_n_tokens (ggml-org#11174)

ggml-ci

---------

Co-authored-by: Diego Devesa <slarengh@gmail.com>
mglambda pushed a commit to mglambda/llama.cpp that referenced this pull request Mar 8, 2025
* llama : functions -> methods (ggml-org#11110)

* llama : add struct llama_vocab to the API (ggml-org#11156)

ggml-ci

* hparams : move vocab params to llama_vocab (ggml-org#11159)

ggml-ci

* vocab : more pimpl (ggml-org#11165)

ggml-ci

* vocab : minor tokenization optimizations (ggml-org#11160)

ggml-ci

Co-authored-by: Diego Devesa <slarengh@gmail.com>

* lora : update API names (ggml-org#11167)

ggml-ci

* llama : update API names to use correct prefix (ggml-org#11174)

* llama : update API names to use correct prefix

ggml-ci

* cont

ggml-ci

* cont

ggml-ci

* minor [no ci]

* vocab : llama_vocab_add_[be]os -> llama_vocab_get_add_[be]os (ggml-org#11174)

ggml-ci

* vocab : llama_vocab_n_vocab -> llama_vocab_n_tokens (ggml-org#11174)

ggml-ci

---------

Co-authored-by: Diego Devesa <slarengh@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
android Issues specific to Android examples server testing Everything test related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants