Skip to content

Commit

Permalink
Merge branch 'upstream' into concedo
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	llama.cpp
#	otherarch/sdcpp/SDCPP_LICENSE
#	scripts/sync-ggml-am.sh
#	scripts/sync-ggml.sh
  • Loading branch information
LostRuins committed Apr 9, 2024
2 parents d1bb126 + 400d5d7 commit df596ae
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions llama.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16180,6 +16180,7 @@ size_t llama_state_seq_load_file(struct llama_context * ctx, const char * filepa
}
}


void printcache(struct llama_context * ctx)
{
struct llama_kv_cache & cache = ctx->kv_self;
Expand Down

0 comments on commit df596ae

Please sign in to comment.