diff --git a/gpttype_adapter.cpp b/gpttype_adapter.cpp index 7582c7d48..bf5e143ca 100644 --- a/gpttype_adapter.cpp +++ b/gpttype_adapter.cpp @@ -4384,6 +4384,7 @@ generation_outputs gpttype_generate(const generation_inputs inputs) bool draft_used = false; int draft_successes = 0; int draft_failures = 0; + int realnprocessed = 0; time0 = timer_check(); timer_start(); @@ -4451,6 +4452,7 @@ generation_outputs gpttype_generate(const generation_inputs inputs) //print progress if (!startedsampling && allow_regular_prints) { + realnprocessed = embd_inp.size(); printf("\rProcessing Prompt%s (%d / %zu tokens)", (blasmode ? " [BATCH]" : ""), input_consumed, embd_inp.size()); } fflush(stdout); @@ -5244,14 +5246,8 @@ generation_outputs gpttype_generate(const generation_inputs inputs) float ts2 = (pt2>0?(1000.0/pt2):0); float tottime = (time1 + time2); float tokens_per_second = tottime>0?(realnpredict <= 0 ? 0 : realnpredict / tottime):0; - if(debugmode==1) - { - printf("\n[%s] CtxLimit:%d/%d, Amt:%d/%d, Init:%.2fs, Process:%.2fs (%.1fms/T = %.2fT/s), Generate:%.2fs (%.1fms/T = %.2fT/s), Total:%.2fs (%.2fT/s)",get_timestamp_str().c_str(),(int)current_context_tokens.size(),(int)nctx, realnpredict, kcpp_data->n_predict, time0, time1, pt1, ts1, time2, pt2, ts2, (time1 + time2), tokens_per_second); - } - else - { - printf("\n[%s] CtxLimit:%d/%d, Amt:%d/%d, Init:%.2fs, Process:%.2fs (%.2fT/s), Generate:%.2fs (%.2fT/s), Total:%.2fs",get_timestamp_str().c_str(),(int)current_context_tokens.size(),(int)nctx, realnpredict, kcpp_data->n_predict, time0, time1, ts1, time2, ts2, (time1 + time2)); - } + printf("\n[%s] CtxLimit:%d/%d, Init:%.2fs, Processed:%d in %.2fs (%.2fT/s), Generated:%d/%d in %.2fs (%.2fT/s), Total:%.2fs", + get_timestamp_str().c_str(),(int)current_context_tokens.size(),(int)nctx, realnprocessed, time0, time1, ts1, realnpredict, kcpp_data->n_predict, time2, ts2, (time1 + time2)); if(debugmode==1 && !is_quiet && (draft_successes+draft_failures)>0) { printf("\n(Draft Results - Success:%d, Failure:%d)",draft_successes,draft_failures);