root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-12 11:40:17 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

minor : add struct members for clarity

Browse Source 
ggml-ci
This commit is contained in:
Georgi Gerganov 2024-08-09 14:36:58 +03:00
parent cfd5a113e1
commit 0596a99f09
No known key found for this signature in database
GPG Key ID: BF970631944C16B7
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/llama.cpp
View File

@ -2720,16 +2720,16 @@ struct llama_sbatch {
ubatch_seq_id.resize(n_ubatch); ubatch_seq_id.resize(n_ubatch);
ubatch_output.resize(n_ubatch); ubatch_output.resize(n_ubatch);
llama_ubatch ubatch = { llama_ubatch ubatch = {
true, /*equal_seqs =*/ true,
0, /*n_tokens =*/ 0,
0, /*n_seq_tokens =*/ 0,
0, /*n_seqs =*/ 0,
!has_embd ? ubatch_token.data() : nullptr, /*token =*/ !has_embd ? ubatch_token.data() : nullptr,
has_embd ? ubatch_embd.data() : nullptr, /*embd =*/ has_embd ? ubatch_embd.data() : nullptr,
ubatch_pos.data(), /*pos =*/ ubatch_pos.data(),
ubatch_n_seq_id.data(), /*n_seq_id =*/ ubatch_n_seq_id.data(),
ubatch_seq_id.data(), /*seq_id =*/ ubatch_seq_id.data(),
ubatch_output.data(), /*output =*/ ubatch_output.data(),
}; };
return ubatch; return ubatch;
} }
@ -18802,7 +18802,18 @@ struct llama_batch llama_batch_get_one(
} }
struct llama_batch llama_batch_init(int32_t n_tokens_alloc, int32_t embd, int32_t n_seq_max) { struct llama_batch llama_batch_init(int32_t n_tokens_alloc, int32_t embd, int32_t n_seq_max) {
llama_batch batch = { 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, 0, 0, 0, }; llama_batch batch = {
/*n_tokens =*/ 0,
/*tokens =*/ nullptr,
/*embd =*/ nullptr,
/*pos =*/ nullptr,
/*n_seq_id =*/ nullptr,
/*seq_id =*/ nullptr,
/*logits =*/ nullptr,
/*all_pos_0 =*/ 0,
/*all_pos_1 =*/ 0,
/*all_seq_id =*/ 0,
};
if (embd) { if (embd) {
batch.embd = (float *) malloc(sizeof(float) * n_tokens_alloc * embd); batch.embd = (float *) malloc(sizeof(float) * n_tokens_alloc * embd);