From: cduk Date: Fri, 13 Dec 2024 22:21:49 +0000 (+0100) Subject: Removes spurious \r in output that causes logging in journalctl to treat lines as... X-Git-Tag: upstream/0.0.4488~162 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=56eea0781cbd2608ed8ff524955495569b9264be;p=pkg%2Fggml%2Fsources%2Fllama.cpp Removes spurious \r in output that causes logging in journalctl to treat lines as binary and therefore hidden by default (#10771) Signed-off-by: Charles Darke Co-authored-by: Charles Darke --- diff --git a/examples/server/server.cpp b/examples/server/server.cpp index 8cb99247..210c36e0 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -1079,9 +1079,9 @@ struct server_slot { SLT_INF(*this, "\n" - "\rprompt eval time = %10.2f ms / %5d tokens (%8.2f ms per token, %8.2f tokens per second)\n" - "\r eval time = %10.2f ms / %5d tokens (%8.2f ms per token, %8.2f tokens per second)\n" - "\r total time = %10.2f ms / %5d tokens\n", + "prompt eval time = %10.2f ms / %5d tokens (%8.2f ms per token, %8.2f tokens per second)\n" + " eval time = %10.2f ms / %5d tokens (%8.2f ms per token, %8.2f tokens per second)\n" + " total time = %10.2f ms / %5d tokens\n", t_prompt_processing, n_prompt_tokens_processed, t_prompt, n_prompt_second, t_token_generation, n_decoded, t_gen, n_gen_second, t_prompt_processing + t_token_generation, n_prompt_tokens_processed + n_decoded);