vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix coloring of last n_batch of prompt, and refactor line input

Browse source
This commit is contained in:
Rickey Bowers Jr 2023-03-16 20:23:32 -06:00
parent 721311070e
commit 8470458b64
1 changed files with 23 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

45
main.cpp
View file

@ -7,6 +7,7 @@
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <fstream> #include <fstream>
#include <iostream>
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
@ -976,11 +977,6 @@ int main(int argc, char ** argv) {
break; break;
} }
} }
// reset color to default if we there is no pending user input
if (!input_noecho && params.use_color && embd_inp.size() == input_consumed) {
printf(ANSI_COLOR_RESET);
}
} }
// display text // display text
@ -990,6 +986,10 @@ int main(int argc, char ** argv) {
} }
fflush(stdout); fflush(stdout);
} }
// reset color to default if we there is no pending user input
if (!input_noecho && params.use_color && embd_inp.size() == input_consumed) {
printf(ANSI_COLOR_RESET);
}
// in interactive mode, and not currently processing queued inputs; // in interactive mode, and not currently processing queued inputs;
// check if we should prompt the user for more // check if we should prompt the user for more
@ -1001,40 +1001,31 @@ int main(int argc, char ** argv) {
} }
if (is_interacting) { if (is_interacting) {
// currently being interactive // currently being interactive
bool another_line=true;
while (another_line) {
fflush(stdout);
char buf[256] = {0};
int n_read;
if (params.use_color) printf(ANSI_BOLD ANSI_COLOR_GREEN); if (params.use_color) printf(ANSI_BOLD ANSI_COLOR_GREEN);
if (scanf("%255[^\n]%n%*c", buf, &n_read) <= 0) { std::string buffer;
// presumable empty line, consume the newline std::string line;
scanf("%*c"); bool another_line = true;
n_read=0; do {
std::getline(std::cin, line);
if (line.empty() || line.back() != '\\') {
another_line = false;
} }
else {
line.pop_back(); // Remove the continue character
}
buffer += line; // Append the line to the result
} while (another_line);
if (params.use_color) printf(ANSI_COLOR_RESET); if (params.use_color) printf(ANSI_COLOR_RESET);
if (n_read > 0 && buf[n_read-1]=='\\') { std::vector<gpt_vocab::id> line_inp = ::llama_tokenize(vocab, buffer, false);
another_line = true;
buf[n_read-1] = '\n';
buf[n_read] = 0;
} else {
another_line = false;
buf[n_read] = '\n';
buf[n_read+1] = 0;
}
std::vector<gpt_vocab::id> line_inp = ::llama_tokenize(vocab, buf, false);
embd_inp.insert(embd_inp.end(), line_inp.begin(), line_inp.end()); embd_inp.insert(embd_inp.end(), line_inp.begin(), line_inp.end());
remaining_tokens -= line_inp.size(); remaining_tokens -= line_inp.size();
input_noecho = true; // do not echo this again input_noecho = true; // do not echo this again
} }
is_interacting = false; is_interacting = false;
} }
}
// end of text token // end of text token
if (embd.back() == 2) { if (embd.back() == 2) {