Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.devops/llama-cli-intel.Dockerfile
#	.devops/llama-server-intel.Dockerfile
#	README.md
#	ggml/src/CMakeLists.txt
#	tests/test-chat-template.cpp
This commit is contained in:
Concedo 2024-07-24 21:57:50 +08:00
commit cca2fa9a6c
4 changed files with 11 additions and 2 deletions

View file

@ -16246,6 +16246,10 @@ int32_t llama_lora_adapter_remove(
return -1;
}
void llama_lora_adapter_clear(struct llama_context * ctx) {
ctx->lora_adapters.clear();
}
void llama_lora_adapter_free(struct llama_lora_adapter * adapter) {
delete adapter;
}