kv-cells : fix tracking of "used" cells

ggerganov · ggerganov · commit 0dc48042400a · 2025-05-24T13:36:52.000+03:00
ggml-ci
diff --git a/src/llama-kv-cells.h b/src/llama-kv-cells.h
@@ -162,20 +162,13 @@ class llama_kv_cells_unified {
         return seq[i].test(seq_id);
     }
 
-    // note: call only if the cell is not empty
-    bool seq_add(uint32_t i, llama_seq_id seq_id) {
+    // note: call only if the cell is not empty and the seq_id is not in the cell
+    void seq_add(uint32_t i, llama_seq_id seq_id) {
         assert(i < pos.size());
         assert(pos[i] != -1);
+        assert(!seq[i].test(seq_id));
 
-        if (seq[i].none()) {
-            seq[i].set(seq_id);
-
-            used++;
-
-            return true;
-        }
-
-        return false;
+        seq[i].set(seq_id);
     }
 
     // note: call only if the cell is not empty
@@ -252,7 +245,7 @@ class llama_kv_cells_unified {
     }
 
 private:
-    uint32_t used = 0; // used cells (i.e. at least one seq_id)
+    uint32_t used = 0; // used cells (i.e. at pos[i] != -1, allowd to not have any sequence)
 
     bool has_shift = false;
 
