tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-08-17 21:51:27 -04: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

2
include/llama.h
View File

@@ -994,6 +994,7 @@ extern "C" {
DEPRECATED(LLAMA_API int32_t llama_encode(
struct llama_context * ctx,
struct llama_batch batch), "use llama_batch_ext API instead");
LLAMA_API int32_t llama_encode_ext(
struct llama_context * ctx,
struct llama_batch_ext * batch);
@@ -1005,6 +1006,7 @@ extern "C" {
DEPRECATED(LLAMA_API int32_t llama_decode(
struct llama_context * ctx,
struct llama_batch batch), "use llama_batch_ext API instead");
LLAMA_API int32_t llama_decode_ext(
struct llama_context * ctx,
struct llama_batch_ext * batch);