Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	tests/test-regex-partial.cpp
This commit is contained in:
Concedo
2026-01-04 11:14:33 +08:00
11 changed files with 119 additions and 59 deletions
+1 -1
View File
@@ -1468,7 +1468,7 @@ ggml_cgraph * llama_context::graph_reserve(
if (n_tokens % n_seqs != 0) {
n_tokens = ((n_tokens + (n_seqs - 1)) / n_seqs) * n_seqs; // round to next multiple of n_seqs
n_outputs = std::min(n_outputs, n_tokens);
n_outputs = std::max(n_outputs, n_tokens);
//LLAMA_LOG_DEBUG("%s: making n_tokens a multiple of n_seqs - n_tokens = %u, n_seqs = %u, n_outputs = %u\n", __func__, n_tokens, n_seqs, n_outputs);
}