root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-12-25 02:44:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

main : consistent prefix/suffix coloring (#3425)

Browse Source 
* Typo

* No `--in-prefix` coloring

The `--in-prefix` text was inconsistently colored. Now, it's never colored, just like the `--in-suffix` text.
This commit is contained in:
h-h-h-h 2023-10-03 20:16:15 +02:00 committed by GitHub
parent ac2219fef3
commit 8186242b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/main/main.cpp
View File

@ -670,7 +670,7 @@ int main(int argc, char ** argv) {
} }
fflush(stdout); fflush(stdout);
} }
// reset color to default if we there is no pending user input // reset color to default if there is no pending user input
if (input_echo && (int) embd_inp.size() == n_consumed) { if (input_echo && (int) embd_inp.size() == n_consumed) {
console::set_display(console::reset); console::set_display(console::reset);
} }
@ -697,10 +697,8 @@ int main(int argc, char ** argv) {
if (last_output.find(antiprompt, search_start_pos) != std::string::npos) { if (last_output.find(antiprompt, search_start_pos) != std::string::npos) {
if (params.interactive) { if (params.interactive) {
is_interacting = true; is_interacting = true;
console::set_display(console::user_input);
} }
is_antiprompt = true; is_antiprompt = true;
fflush(stdout);
break; break;
} }
} }
@ -724,8 +722,6 @@ int main(int argc, char ** argv) {
is_interacting = true; is_interacting = true;
printf("\n"); printf("\n");
console::set_display(console::user_input);
fflush(stdout);
} else if (params.instruct) { } else if (params.instruct) {
is_interacting = true; is_interacting = true;
} }
@ -750,6 +746,9 @@ int main(int argc, char ** argv) {
printf("%s", buffer.c_str()); printf("%s", buffer.c_str());
} }
// color user input only
console::set_display(console::user_input);
std::string line; std::string line;
bool another_line = true; bool another_line = true;
do { do {