Skip to content

Commit b345226

Browse files
committed
Revert "llama : enable LLAMA_SET_ROWS=1 by default (ggml-org#14959)"
This reverts commit 69ea8ec.
1 parent 5ecb83a commit b345226

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/llama-context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ llama_context::llama_context(
105105

106106
{
107107
const char * LLAMA_SET_ROWS = getenv("LLAMA_SET_ROWS");
108-
supports_set_rows = LLAMA_SET_ROWS ? (atoi(LLAMA_SET_ROWS) != 0) : supports_set_rows;
108+
supports_set_rows = LLAMA_SET_ROWS ? (atoi(LLAMA_SET_ROWS) != 0) : false;
109109

110110
if (!supports_set_rows && !cparams.kv_unified) {
111111
LLAMA_LOG_WARN("%s: non-unified KV cache requires ggml_set_rows() - forcing unified KV cache\n", __func__);

src/llama-context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ struct llama_context {
289289

290290
// env: LLAMA_SET_ROWS (temporary)
291291
// ref: https://github.com/ggml-org/llama.cpp/pull/14285
292-
bool supports_set_rows = true;
292+
bool supports_set_rows = false;
293293

294294
// env: LLAMA_GRAPH_REUSE_DISABLE
295295
bool graph_reuse_disable = false;

src/llama-kv-cache-unified.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ llama_kv_cache_unified::llama_kv_cache_unified(
197197
debug = LLAMA_KV_CACHE_DEBUG ? atoi(LLAMA_KV_CACHE_DEBUG) : 0;
198198

199199
const char * LLAMA_SET_ROWS = getenv("LLAMA_SET_ROWS");
200-
supports_set_rows = LLAMA_SET_ROWS ? atoi(LLAMA_SET_ROWS) != 0 : supports_set_rows;
200+
supports_set_rows = LLAMA_SET_ROWS ? atoi(LLAMA_SET_ROWS) != 0 : 0;
201201

202202
if (!supports_set_rows) {
203203
// ref: https://github.com/ggml-org/llama.cpp/pull/14363

src/llama-kv-cache-unified.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class llama_kv_cache_unified : public llama_memory_i {
230230

231231
// env: LLAMA_SET_ROWS (temporary)
232232
// ref: https://github.com/ggml-org/llama.cpp/pull/14285
233-
bool supports_set_rows = true;
233+
bool supports_set_rows = false;
234234

235235
const llama_swa_type swa_type = LLAMA_SWA_TYPE_NONE;
236236

0 commit comments

Comments
 (0)