Merge commit '0fc16b42e8793364918e830c234c1f3caec29dae' into concedo_experimental

# Conflicts:
#	src/CMakeLists.txt
#	src/llama-kv-cache.cpp
This commit is contained in:
Concedo
2025-06-02 23:14:23 +08:00
11 changed files with 3714 additions and 3674 deletions
+3
View File
@@ -12,6 +12,9 @@ static bool old_mixtral_warning_showed = false;
#include "llama-grammar.cpp"
#include "llama-sampling.cpp"
#include "llama-kv-cache.cpp"
#include "llama-kv-cache-unified.cpp"
#include "llama-kv-cache-unified-iswa.cpp"
#include "llama-kv-cache-recurrent.cpp"
#include "llama-model-loader.cpp"
#include "llama-model-saver.cpp"
#include "llama-model.cpp"