Merge commit '456af35eb7' into concedo_experimental

# Conflicts:
#	ggml/src/ggml-sycl/getrows.cpp
#	src/CMakeLists.txt
#	tools/llama-bench/llama-bench.cpp
This commit is contained in:
Concedo 2025-06-20 23:41:27 +08:00
commit b59b5dbbd1
28 changed files with 1403 additions and 496 deletions

View file

@ -13,7 +13,8 @@ static bool old_mixtral_warning_showed = false;
#include "llama-sampling.cpp"
#include "llama-kv-cache-unified.cpp"
#include "llama-kv-cache-unified-iswa.cpp"
#include "llama-kv-cache-recurrent.cpp"
#include "llama-memory-hybrid.cpp"
#include "llama-memory-recurrent.cpp"
#include "llama-model-loader.cpp"
#include "llama-model-saver.cpp"
#include "llama-model.cpp"