CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-11-02 09:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into custom-attention-mask

Browse Source
This commit is contained in:
Georgi Gerganov
2023-09-28 15:19:57 +03:00
parent c1596f633f 4aea3b846e
commit 25856900db
36 changed files with 730 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/llama-bench/llama-bench.cpp
View File

@@ -903,7 +903,7 @@ static void test_gen(llama_context * ctx, int n_gen, int n_past, int n_threads)
}
}
static void llama_null_log_callback(enum llama_log_level level, const char * text, void * user_data) {
static void llama_null_log_callback(enum ggml_log_level level, const char * text, void * user_data) {
(void) level;
(void) text;
(void) user_data;