Merge remote-tracking branch 'temp/concedo' into concedo_experimental

# Conflicts:
#	koboldcpp.py
This commit is contained in:
Concedo 2023-05-02 22:43:34 +08:00
commit 966cd2ce91
4 changed files with 63 additions and 49 deletions

View file

@ -158,7 +158,7 @@ ModelLoadResult gpttype_load_model(const load_model_inputs inputs, FileFormat in
llama_ctx_params.f16_kv = inputs.f16_kv;
llama_ctx_params.logits_all = false;
llama_ctx_params.use_mmap = inputs.use_mmap;
llama_ctx_params.use_mlock = false;
llama_ctx_params.use_mlock = inputs.use_mlock;
llama_ctx_v1 = llama_init_from_file(modelname.c_str(), llama_ctx_params);