Merge branch 'upstream' into concedo

# Conflicts:
#	README.md
#	llama.cpp
#	otherarch/sdcpp/SDCPP_LICENSE
#	scripts/sync-ggml-am.sh
#	scripts/sync-ggml.sh
This commit is contained in:
Concedo 2024-04-09 18:07:03 +08:00
commit df596aeef3

View file

@ -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;