Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	Makefile
#	ggml/src/CMakeLists.txt
This commit is contained in:
Concedo 2024-07-24 16:41:33 +08:00
commit 01d5175654
6 changed files with 379 additions and 437 deletions

View file

@ -150,7 +150,6 @@ struct gpt_params {
// TODO: avoid tuple, use struct
std::vector<std::tuple<std::string, float>> lora_adapter; // lora adapter path with user defined scale
std::string lora_base = ""; // base model path for the lora adapter
std::vector<llama_control_vector_load_info> control_vectors; // control vector with user defined scale
@ -277,6 +276,8 @@ struct gpt_params {
std::string cvector_negative_file = "examples/cvector-generator/negative.txt";
bool spm_infill = false; // suffix/prefix/middle pattern for infill
std::string lora_outfile = "ggml-lora-merged-f16.gguf";
};
void gpt_params_handle_hf_token(gpt_params & params);