Skip to content

Commit f4d2640

Browse files
committed
add plaintext cli option to print results in plaintext
1 parent cf1cc74 commit f4d2640

File tree

4 files changed

+18
-45
lines changed

4 files changed

+18
-45
lines changed

localscore/ascii_digits.h

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -51,44 +51,6 @@ inline void printLargeNumber(int number) {
5151
}
5252
}
5353

54-
// inline void print_logo() {
55-
// std::cout <<
56-
// "██ ██████ ██████ █████ ██ \n"
57-
// "██ ██ ██ ██ ██ ██ ██ \n"
58-
// "██ ██ ██ ██ ███████ ██ \n"
59-
// "██ ██ ██ ██ ██ ██ ██ \n"
60-
// "███████ ██████ ██████ ██ ██ ███████ \n"
61-
// " \n"
62-
// "███████ ██████ ██████ ██████ ███████ \n"
63-
// "██ ██ ██ ██ ██ ██ ██ \n"
64-
// "███████ ██ ██ ██ ██████ █████ \n"
65-
// " ██ ██ ██ ██ ██ ██ ██ \n"
66-
// "███████ ██████ ██████ ██ ██ ███████ \n"
67-
// "\n"
68-
// "---------------------------------------- \n";
69-
// }
70-
71-
72-
73-
// inline void print_logo() {
74-
// std::cout <<
75-
// " ___ ________ ________ ________ ___ \n"
76-
// "|\\ \\ |\\ __ \\|\\ ____\\|\\ __ \\|\\ \\ \n"
77-
// "\\ \\ \\ \\ \\ \\|\\ \\ \\ \\___|\\ \\|\\ \\ \\ \\ \n"
78-
// " \\ \\ \\ \\ \\ \\\\\\ \\ \\ \\ \\ \\ __ \\ \\ \\ \n"
79-
// " \\ \\ \\____\\ \\ \\\\\\ \\ \\ \\____\\ \\ \\ \\ \\ \\ \\____ \n"
80-
// " \\ \\_______\\ \\_______\\ \\_______\\ \\__\\ \\__\\ \\_______\\\n"
81-
// " \\|_______|\\|_______|\\|_______|\\|__|\\|__|\\|_______|\n"
82-
// " ________ ________ ________ ________ _______ \n"
83-
// "|\\ ____\\|\\ ____\\|\\ __ \\|\\ __ \\|\\ ___ \\ \n"
84-
// "\\ \\ \\___|\\ \\___|\\ \\|\\ \\ \\ \\|\\ \\ \\ __/| \n"
85-
// " \\ \\_____ \\ \\ \\ \\ \\ \\\\\\ \\ \\ _ _\\ \\ \\_|/__ \n"
86-
// " \\|____|\\ \\ \\ \\____\\ \\ \\\\\\ \\ \\ \\\\ \\\\ \\ \\_|\\ \\ \n"
87-
// " ____\\_\\ \\ \\_______\\ \\_______\\ \\__\\\\ _\\\\ \\_______\\\n"
88-
// " |\\_________\\|_______|\\|_______|\\|__|\\|__|\\|_______|\n"
89-
// " \\|_________| \n";
90-
// }
91-
9254
inline void print_logo() {
9355
std::cout << " __ ____ _________ __ _____ __________ ____ ______\n"
9456
<< " / / / __ \\/ ____/ | / / / ___// ____/ __ \\/ __ \\/ ____/\n"

localscore/cmd.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ static const cmd_params cmd_params_defaults = {
2626
/* numa */ GGML_NUMA_STRATEGY_DISABLED,
2727
/* reps */ 1,
2828
/* verbose */ false,
29+
/* plaintext */ false,
2930
/* send_results */ SEND_ASK,
3031
/* output_format */ CONSOLE,
3132
};
@@ -126,6 +127,8 @@ cmd_params parse_cmd_params(int argc, char ** argv) {
126127
}
127128
} else if (arg == "-v" || arg == "--verbose") {
128129
params.verbose = true;
130+
} else if (arg == "--plaintext") {
131+
params.plaintext = true;
129132
} else if (arg == "-y" || arg == "--send-results") {
130133
params.send_results = SEND_YES;
131134
} else if (arg == "-n" || arg == "--no-send-results") {
@@ -186,13 +189,14 @@ void print_usage(int /* argc */, char ** argv) {
186189
printf("\n");
187190
printf("options:\n");
188191
printf(" -h, --help\n");
189-
printf(" -m, --model <filename> (default: %s)\n", cmd_params_defaults.model.c_str());
192+
printf(" -m, --model <filename>\n");
190193
printf(" -c, --cpu disable GPU acceleration (alias for --gpu=disabled)\n");
191194
printf(" -g, --gpu <auto|amd|apple|nvidia|disabled> (default: \"auto\")\n");
192195
printf(" -i, --gpu-index <i> select GPU by index (default: %d)\n", cmd_params_defaults.main_gpu);
193196
printf(" --list-gpus list available GPUs and exit\n");
194197
printf(" -o, --output <csv|json|console> (default: %s)\n", output_format_str(cmd_params_defaults.output_format));
195-
printf(" -v, --verbose verbose output (default: %s)\n", cmd_params_defaults.verbose ? "yes" : "no");
198+
printf(" -v, --verbose verbose output (default: %s)\n", cmd_params_defaults.verbose ? "on" : "off");
199+
printf(" --plaintext plaintext output (default: %s)\n", cmd_params_defaults.plaintext ? "on" : "off");
196200
printf(" -y, --send-results send results without confirmation\n");
197201
printf(" -n, --no-send-results disable sending results\n");
198202
printf(" -e, --extended run 4 reps (shortcut for --reps=4)\n");

localscore/cmd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ struct cmd_params {
2828
ggml_numa_strategy numa;
2929
int reps;
3030
bool verbose;
31+
bool plaintext;
3132
send_results_mode send_results;
3233
output_formats output_format;
3334

localscore/localscore.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,18 @@ static LocalScoreResultsSummary getResultsSummary(Json data) {
336336
return rs;
337337
}
338338

339-
static void displayResults(LocalScoreResultsSummary results_summary) {
339+
static void displayResults(LocalScoreResultsSummary results_summary, bool plaintext) {
340+
340341
printf("\n\033[1;35m");
341-
ascii_display::print_logo();
342-
printf("\n");
343-
ascii_display::printLargeNumber((int)results_summary.performance_score);
342+
if (!plaintext) {
343+
ascii_display::print_logo();
344+
printf("\n");
345+
ascii_display::printLargeNumber((int)results_summary.performance_score);
346+
} else {
347+
printf("LocalScore: \t\t %d", (int)results_summary.performance_score);
348+
}
344349
printf("\033[0m\n");
350+
345351
printf("\033[32mToken Generation: \t \033[1;32m%.2f\033[0m \033[3;32mtok/s\033[0m\n", results_summary.avg_gen_tps);
346352
printf("\033[36mPrompt Processing: \t \033[1;36m%.2f\033[0m \033[3;36mtok/s\033[0m\n", results_summary.avg_prompt_tps);
347353
printf("\033[33mTime to First Token:\t \033[1;33m%.2f\033[0m \033[3;33mms\033[0m\n", results_summary.avg_ttft_ms);
@@ -474,7 +480,7 @@ void process_and_submit_results(const std::string& req_payload, const cmd_params
474480
exit(1);
475481
}
476482
LocalScoreResultsSummary rs = getResultsSummary(data);
477-
displayResults(rs);
483+
displayResults(rs, params.plaintext);
478484

479485
Json results_summary;
480486
results_summary.setObject();

0 commit comments

Comments
 (0)