refactor: recurrent_layer() -> is_recurrent()

gabe-l-hart · gabe-l-hart · commit 35c0233621d0 · 2025-06-18T10:23:59.000-06:00
Branch: HybridRecurrentCache

Signed-off-by: Gabe Goodhart &lt;ghart@us.ibm.com&gt;
diff --git a/src/llama-hparams.cpp b/src/llama-hparams.cpp
@@ -86,7 +86,7 @@ uint32_t llama_hparams::n_embd_s() const {
     return ssm_d_state * ssm_d_inner;
 }
 
-bool llama_hparams::recurrent_layer(uint32_t il) const {
+bool llama_hparams::is_recurrent(uint32_t il) const {
     return recurrent_layer_arr[il];
 }
 
diff --git a/src/llama-hparams.h b/src/llama-hparams.h
@@ -190,7 +190,7 @@ struct llama_hparams {
     uint32_t n_embd_s() const;
 
     // whether or not the given layer is recurrent (for hybrid models)
-    bool recurrent_layer(uint32_t il) const;
+    bool is_recurrent(uint32_t il) const;
 
     bool is_swa(uint32_t il) const;
 };
diff --git a/src/llama-memory-hybrid.cpp b/src/llama-memory-hybrid.cpp
@@ -32,7 +32,7 @@ llama_memory_hybrid::llama_memory_hybrid(
     mem_attn(new llama_kv_cache_unified(
         model,
         filter_attn == nullptr ?
-            [&](int32_t il) { return !model.hparams.recurrent_layer(il); }
+            [&](int32_t il) { return !model.hparams.is_recurrent(il); }
             : filter_attn,
         type_k,
         type_v,
@@ -47,7 +47,7 @@ llama_memory_hybrid::llama_memory_hybrid(
     mem_recr(new llama_memory_recurrent(
         model,
         filter_recr == nullptr ?
-            [&](int32_t il) { return model.hparams.recurrent_layer(il); }
+            [&](int32_t il) { return model.hparams.is_recurrent(il); }
             : filter_recr,
         type_r,
         type_s,

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ uint32_t llama_hparams::n_embd_s() const {`
`86`	`86`	`return ssm_d_state * ssm_d_inner;`
`87`	`87`	`}`
`88`	`88`
`89`		`-bool llama_hparams::recurrent_layer(uint32_t il) const {`
	`89`	`+bool llama_hparams::is_recurrent(uint32_t il) const {`
`90`	`90`	`return recurrent_layer_arr[il];`
`91`	`91`	`}`
`92`	`92`