mirror of
https://github.com/ggml-org/llama.cpp.git
synced 2025-11-04 09:32:00 +00:00
12d0188c0d
* kv-cache : simplify the "struct llama_kv_cache" interface ggml-ci * kv-cache : revert the (n_swa + n_ubatch) change (for next PR) ggml-ci * kv-cache : some comments ggml-ci * context : fix graph reserve for multiple sequences ggml-ci * kv-cache : fix typo [no ci] * kv-cache : fix find_slot() logic for free slots ggml-ci * llama : add TODO for deprecating the defrag API in the future * kv-cache : improve find_slot() using min/max seq pos info ggml-ci * llama : handle aborts and compute errors ggml-ci * memory : extract state into llama_memory_state ggml-ci * kv-cache : add comments ggml-ci * server : update batching logic to reset n_batch on successful decode * server : upon full re-processing, remove the sequence from the cache * kv-cache : add TODO for doing split_equal when split_simple fails ggml-ci
95 lines
2.7 KiB
C++
95 lines
2.7 KiB
C++
#pragma once
|
|
|
|
#include "llama.h"
|
|
|
|
#include <array>
|
|
#include <vector>
|
|
|
|
// very similar to llama_batch,
|
|
// but has more metadata about sequences
|
|
struct llama_ubatch {
|
|
bool equal_seqs;
|
|
// TODO: whole_seqs for embeddings?
|
|
|
|
uint32_t n_tokens; // total tokens (n_seq_tokens * n_seqs)
|
|
uint32_t n_seq_tokens; // tokens per sequence
|
|
uint32_t n_seqs;
|
|
|
|
llama_token * token; // [n_tokens]
|
|
float * embd; // [n_embd, n_tokens]
|
|
llama_pos * pos; // [n_tokens]
|
|
int32_t * n_seq_id; // [n_seqs] // TODO: remove, should belong to only 1 sequence
|
|
llama_seq_id ** seq_id; // [n_seqs] // TODO: become llama_seq_id * seq_id;
|
|
int8_t * output; // [n_tokens]
|
|
};
|
|
|
|
struct llama_sbatch_seq {
|
|
int32_t n_seq_id;
|
|
|
|
llama_seq_id * seq_id;
|
|
|
|
size_t offset;
|
|
size_t length;
|
|
};
|
|
|
|
// sequence-length-aware batch splitting
|
|
struct llama_sbatch {
|
|
// tokens left in this batch
|
|
size_t n_tokens;
|
|
|
|
size_t n_embd;
|
|
|
|
bool logits_all; // TODO: remove once lctx.logits_all is removed too
|
|
|
|
// sorted indices into the batch
|
|
std::vector<int64_t> ids;
|
|
// batch indices of the output
|
|
std::vector<int64_t> out_ids;
|
|
std::vector<llama_sbatch_seq> seq;
|
|
|
|
const llama_batch * batch = nullptr;
|
|
|
|
// buffers for the ubatches
|
|
// TODO: very hacky, this needs a complete rework
|
|
struct ubatch_data {
|
|
std::vector<llama_token> token;
|
|
std::vector<float> embd;
|
|
std::vector<llama_pos> pos;
|
|
std::vector<int32_t> n_seq_id;
|
|
std::vector<llama_seq_id *> seq_id;
|
|
std::vector<int8_t> output;
|
|
};
|
|
|
|
std::vector<ubatch_data> udatas;
|
|
|
|
llama_ubatch reserve_ubatch(size_t n_ubatch, bool has_embd = false);
|
|
|
|
void add_seq_to_ubatch(llama_ubatch & ubatch, llama_sbatch_seq & seq, size_t length);
|
|
|
|
// simple split, unknown number of sequences of unequal lengths
|
|
llama_ubatch split_simple(size_t n_ubatch);
|
|
|
|
// make batches of equal-length sequences
|
|
llama_ubatch split_equal(size_t n_ubatch);
|
|
|
|
// sequence-wise split
|
|
llama_ubatch split_seq(size_t n_ubatch);
|
|
|
|
llama_sbatch() = default;
|
|
llama_sbatch(const llama_batch & batch, size_t n_embd, bool simple_split = false, bool logits_all = false);
|
|
};
|
|
|
|
// temporary allocate memory for the input batch if needed
|
|
struct llama_batch_allocr {
|
|
struct llama_batch batch;
|
|
|
|
std::array<llama_seq_id, 1> seq_id_0 = { 0 }; // default sequence id
|
|
std::vector<llama_pos> pos;
|
|
std::vector<int32_t> n_seq_id;
|
|
std::vector<llama_seq_id *> seq_id;
|
|
std::vector<int8_t> logits;
|
|
|
|
// optionally fulfill the batch returned by llama_batch_get_one
|
|
llama_batch_allocr(struct llama_batch in_batch, llama_pos p0);
|
|
};
|