Merge commit '8c146a8366304c871efc26057cc90370ccf58dad' into concedo_experimental

# Conflicts:
#	src/CMakeLists.txt
#	tests/test-llama-archs.cpp
This commit is contained in:
Concedo
2026-06-30 22:00:03 +08:00
26 changed files with 4591 additions and 40 deletions
+5 -1
View File
@@ -2331,7 +2331,11 @@ void llama_context::output_reorder() {
//
uint32_t llama_context::graph_max_nodes(uint32_t n_tokens) const {
if (model.arch == LLM_ARCH_QWEN3NEXT || model.arch == LLM_ARCH_KIMI_LINEAR || model.arch == LLM_ARCH_QWEN35 || model.arch == LLM_ARCH_QWEN35MOE) {
if (model.arch == LLM_ARCH_QWEN3NEXT ||
model.arch == LLM_ARCH_KIMI_LINEAR ||
model.arch == LLM_ARCH_QWEN35 ||
model.arch == LLM_ARCH_QWEN35MOE ||
model.arch == LLM_ARCH_DEEPSEEK4) {
return std::max<uint32_t>(n_tokens * 40, 32u * model.n_tensors());
}
uint32_t res = std::max<uint32_t>(1024u, 8u*model.n_tensors());