Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	Makefile
#	README.md
#	examples/server/CMakeLists.txt
#	ggml/src/CMakeLists.txt
This commit is contained in:
Concedo 2024-09-15 19:28:05 +08:00
commit ab41e324d6
6 changed files with 28 additions and 5 deletions

View file

@ -15903,7 +15903,7 @@ static void llama_set_inputs(llama_context & lctx, const llama_ubatch & batch) {
// clear unused states
for (int i = 0; i < n_kv; ++i) {
uint32_t cell_id = i + kv_self.head;
const uint32_t cell_id = i + kv_self.head;
llama_kv_cell & kv_cell = lctx.kv_self.cells[cell_id];
data[i] = (float) (kv_cell.src >= 0);