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

Change --multiline implementation to be toggled by EOF.

Browse source
This commit is contained in:
Tomáš Pazdiora 2023-04-09 21:05:11 +02:00
parent d98f613cc4
commit 73966bc983
2 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

44
examples/common.cpp
View file

@ -334,7 +334,7 @@ void gpt_print_usage(char * argv_0, const gpt_params & params) {
fprintf(stderr, " run in interactive mode and poll user input upon seeing PROMPT (can be\n"); fprintf(stderr, " run in interactive mode and poll user input upon seeing PROMPT (can be\n");
fprintf(stderr, " specified more than once for multiple prompts).\n"); fprintf(stderr, " specified more than once for multiple prompts).\n");
fprintf(stderr, " --color colorise output to distinguish prompt and user input from generations\n"); fprintf(stderr, " --color colorise output to distinguish prompt and user input from generations\n");
fprintf(stderr, " --multiline multiline mode (use Ctrl+D on Linux/Mac and Ctrl+Z then Return on Windows to send input)\n"); fprintf(stderr, " --multiline multiline mode (use Ctrl+D on Linux/Mac and Ctrl+Z then Return on Windows to toggle multiline)\n");
fprintf(stderr, " -s SEED, --seed SEED RNG seed (default: -1, use random seed for <= 0)\n"); fprintf(stderr, " -s SEED, --seed SEED RNG seed (default: -1, use random seed for <= 0)\n");
fprintf(stderr, " -t N, --threads N number of threads to use during computation (default: %d)\n", params.n_threads); fprintf(stderr, " -t N, --threads N number of threads to use during computation (default: %d)\n", params.n_threads);
fprintf(stderr, " -p PROMPT, --prompt PROMPT\n"); fprintf(stderr, " -p PROMPT, --prompt PROMPT\n");
@ -455,45 +455,55 @@ void win32_utf8_encode(const std::wstring & wstr, std::string & str) {
} }
#endif #endif
bool get_input_text(std::string & input_text, bool escape_newline_mode) { bool get_input_text(std::string & input_text, bool eof_toggled_multiline_mode) {
bool another_line = true; bool another_line = true;
bool is_eof_multiline_toggled = false;
do { do {
std::string line; std::string line;
#if defined(_WIN32) #if defined(_WIN32)
auto & stdcin = std::wcin;
std::wstring wline; std::wstring wline;
if (!std::getline(std::wcin, wline)) { if (!std::getline(stdcin, wline)) {
// input stream is bad or EOF received // input stream is bad or EOF received
if (std::wcin.bad()) { if (stdcin.bad()) {
fprintf(stderr, "%s: error: input stream bad\n", __func__); fprintf(stderr, "%s: error: input stream bad\n", __func__);
return 1; return 1;
} }
} }
if (std::wcin.eof()) {
another_line = false;
std::wcin.clear();
std::wcin.seekg(0, std::ios::beg);
}
win32_utf8_encode(wline, line); win32_utf8_encode(wline, line);
#else #else
if (!std::getline(std::cin, line)) { auto & stdcin = std::cin;
if (!std::getline(stdcin, line)) {
// input stream is bad or EOF received // input stream is bad or EOF received
if (std::wcin.bad()) { if (stdcin.bad()) {
fprintf(stderr, "%s: error: input stream bad\n", __func__); fprintf(stderr, "%s: error: input stream bad\n", __func__);
return 1; return 1;
} }
} }
if (std::cin.eof()) {
another_line = false;
std::cin.clear();
std::cin.seekg(0, std::ios::beg);
}
#endif #endif
if (escape_newline_mode) { if (stdcin.eof()) {
stdcin.clear();
stdcin.seekg(0, std::ios::beg);
if (!eof_toggled_multiline_mode) {
another_line = false;
} else {
is_eof_multiline_toggled = !is_eof_multiline_toggled;
if (is_eof_multiline_toggled) {
input_text += line;
continue;
}
}
}
if (!eof_toggled_multiline_mode) {
if (line.empty() || line.back() != '\\') { if (line.empty() || line.back() != '\\') {
another_line = false; another_line = false;
} else { } else {
line.pop_back(); // Remove the continue character line.pop_back(); // Remove the continue character
} }
} else {
if (!is_eof_multiline_toggled) {
another_line = false;
}
} }
input_text += line; input_text += line;
if (another_line) { if (another_line) {

7
examples/main/main.cpp
View file

@ -238,10 +238,11 @@ int main(int argc, char ** argv) {
#endif #endif
); );
if (params.multiline_mode) { if (params.multiline_mode) {
fprintf(stderr, " - Press Return to return control to LLaMa.\n"
#if defined (_WIN32) #if defined (_WIN32)
fprintf(stderr, " - [MULTILINE MODE] Press Ctrl+Z then Return (EOF) to return control to LLaMa.\n\n"); " - [MULTILINE MODE] Press Ctrl+Z then Return (EOF) to toggle.\n\n");
#else #else
fprintf(stderr, " - [MULTILINE MODE] Press Ctrl+D (EOF) to return control to LLaMa.\n\n"); " - [MULTILINE MODE] Press Ctrl+D (EOF) to toggle.\n\n");
#endif #endif
} }
else { else {
@ -456,7 +457,7 @@ int main(int argc, char ** argv) {
printf("%s", buffer.c_str()); printf("%s", buffer.c_str());
} }
if (!get_input_text(buffer, !params.multiline_mode)) { if (!get_input_text(buffer, params.multiline_mode)) {
// input stream is bad // input stream is bad
return 1; return 1;
} }