Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	src/llama-kv-cache.cpp
#	tests/test-backend-ops.cpp
This commit is contained in:
Concedo
2025-08-25 01:53:26 +08:00
23 changed files with 721 additions and 324 deletions
+7 -7
View File
@@ -16,13 +16,13 @@
//
llama_memory_recurrent::llama_memory_recurrent(
const llama_model & model,
layer_filter_cb && filter,
ggml_type type_r,
ggml_type type_s,
bool offload,
uint32_t mem_size,
uint32_t n_seq_max) : hparams(model.hparams), n_seq_max(n_seq_max) {
const llama_model & model,
ggml_type type_r,
ggml_type type_s,
bool offload,
uint32_t mem_size,
uint32_t n_seq_max,
const layer_filter_cb & filter) : hparams(model.hparams), n_seq_max(n_seq_max) {
const int32_t n_layer = hparams.n_layer;
head = 0;