CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-11-08 10:07:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Xuan Son Nguyen
2025-03-13 17:32:36 +01:00
parent 17f954c8e2
commit 86973cb14a
3 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/llama-context.h
View File

@@ -81,9 +81,13 @@ struct llama_context {
int32_t il_start,
int32_t il_end);
// deprecated
int encode(llama_batch & inp_batch);
int decode(llama_batch & inp_batch);
int encode(llama_batch_ext & inp_batch);
int decode(llama_batch_ext & inp_batch);
//
// state save/load
//