vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-10 17:14:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Concedo 2023-07-11 18:45:36 +08:00
commit 7222877069
4 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gpttype_adapter.cpp
View file

@ -33,6 +33,8 @@ std::string executable_path = "";
std::string lora_filename = "";
std::string lora_base = "";
bool generation_finished;
float prompt_process_time;
float prompt_eval_time;
std::vector<std::string> generated_tokens;
//return val: 0=fail, 1=(original ggml, alpaca), 2=(ggmf), 3=(ggjt)
@ -867,6 +869,8 @@ generation_outputs gpttype_generate(const generation_inputs inputs, generation_o
bool stream_sse = inputs.stream_sse;
generation_finished = false; // Set current generation status
prompt_eval_time = 0;
prompt_process_time = 0;
generated_tokens.clear(); // New Generation, new tokens
if (params.repeat_last_n < 1)
@ -1445,6 +1449,8 @@ generation_outputs gpttype_generate(const generation_inputs inputs, generation_o
fflush(stdout);
output.status = 1;
generation_finished = true;
prompt_eval_time = pt2;
prompt_process_time = pt1;
snprintf(output.text, sizeof(output.text), "%s", concat_output.c_str());
return output;