Skip to content

Commit 2048498

Browse files
committed
refactor: rename *_is_hybrid -> *_is_hybrid_recurrent
The implementation of the hybrid cache intentionally does not specify the types of the child caches, so there was a naming mismatch with these predicate functions that used "hybrid" to imply "hybrid recurrent." Branch: HybridCache Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
1 parent cb47421 commit 2048498

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

include/llama.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ extern "C" {
558558
LLAMA_API bool llama_model_is_recurrent(const struct llama_model * model);
559559

560560
// Returns true if the model is hybrid-recurrent (like Jamba, Bamba, etc.)
561-
LLAMA_API bool llama_model_is_hybrid(const struct llama_model * model);
561+
LLAMA_API bool llama_model_is_hybrid_recurrent(const struct llama_model * model);
562562

563563
// Returns 0 on success
564564
LLAMA_API uint32_t llama_model_quantize(

src/llama-arch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,7 @@ bool llm_arch_is_recurrent(const llm_arch & arch) {
17621762
}
17631763
}
17641764

1765-
bool llm_arch_is_hybrid(const llm_arch & arch) {
1765+
bool llm_arch_is_hybrid_recurrent(const llm_arch & arch) {
17661766
// TODO: There are currently no hybrid models! Once there are, this will be
17671767
// the place to identify them
17681768
switch (arch) {

src/llama-arch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,4 +440,4 @@ llm_arch llm_arch_from_string(const std::string & name);
440440
const llm_tensor_info & llm_tensor_info_for(llm_tensor tensor);
441441

442442
bool llm_arch_is_recurrent(const llm_arch& arch);
443-
bool llm_arch_is_hybrid(const llm_arch& arch);
443+
bool llm_arch_is_hybrid_recurrent(const llm_arch& arch);

src/llama-model.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13811,8 +13811,8 @@ bool llama_model_is_recurrent(const llama_model * model) {
1381113811
return llm_arch_is_recurrent(model->arch);
1381213812
}
1381313813

13814-
bool llama_model_is_hybrid(const llama_model * model) {
13815-
return llm_arch_is_hybrid(model->arch);
13814+
bool llama_model_is_hybrid_recurrent(const llama_model * model) {
13815+
return llm_arch_is_hybrid_recurrent(model->arch);
1381613816
}
1381713817

1381813818
const std::vector<std::pair<std::string, ggml_tensor *>> & llama_internal_get_tensor_map(const llama_model * model) {

0 commit comments

Comments
 (0)