cont : better name [no ci]

ggerganov · ggerganov · commit eb5518f0153a · 2025-04-02T12:57:04.000+03:00
diff --git a/src/llama-context.cpp b/src/llama-context.cpp
@@ -1201,7 +1201,7 @@ int llama_context::decode(llama_batch & inp_batch) {
     const int64_t n_tokens_all = batch.n_tokens;
     const int64_t n_embd       = hparams.n_embd;
 
-    llama_kv_cache_guard kvg(kv_self.get());
+    llama_kv_cache_guard kv_guard(kv_self.get());
 
     GGML_ASSERT((!batch.token && batch.embd) || (batch.token && !batch.embd)); // NOLINT
 
@@ -1423,7 +1423,7 @@ int llama_context::decode(llama_batch & inp_batch) {
     }
 
     // finalize the batch processing
-    kvg.commit();
+    kv_guard.commit();
 
     // set output mappings
     {

Original file line number	Diff line number	Diff line change
`@@ -1201,7 +1201,7 @@ int llama_context::decode(llama_batch & inp_batch) {`
`1201`	`1201`	`const int64_t n_tokens_all = batch.n_tokens;`
`1202`	`1202`	`const int64_t n_embd = hparams.n_embd;`
`1203`	`1203`
`1204`		`- llama_kv_cache_guard kvg(kv_self.get());`
	`1204`	`+ llama_kv_cache_guard kv_guard(kv_self.get());`
`1205`	`1205`
`1206`	`1206`	`GGML_ASSERT((!batch.token && batch.embd) \|\| (batch.token && !batch.embd)); // NOLINT`
`1207`	`1207`
`@@ -1423,7 +1423,7 @@ int llama_context::decode(llama_batch & inp_batch) {`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`	`1425`	`// finalize the batch processing`
`1426`		`- kvg.commit();`
	`1426`	`+ kv_guard.commit();`
`1427`	`1427`
`1428`	`1428`	`// set output mappings`
`1429`	`1429`	`{`