mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-10-31 08:51:55 +00:00 
			
		
		
		
	main : switch input_noecho to input_echo to remove negation (#979)
Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
		| @@ -298,7 +298,7 @@ int main(int argc, char ** argv) { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     bool is_antiprompt = false; |     bool is_antiprompt = false; | ||||||
|     bool input_noecho  = false; |     bool input_echo  = true; | ||||||
|  |  | ||||||
|     // HACK - because session saving incurs a non-negligible delay, for now skip re-saving session |     // HACK - because session saving incurs a non-negligible delay, for now skip re-saving session | ||||||
|     // if we loaded a session with at least 75% similarity. It's currently just used to speed up the |     // if we loaded a session with at least 75% similarity. It's currently just used to speed up the | ||||||
| @@ -485,7 +485,7 @@ int main(int argc, char ** argv) { | |||||||
|             embd.push_back(id); |             embd.push_back(id); | ||||||
|  |  | ||||||
|             // echo this to console |             // echo this to console | ||||||
|             input_noecho = false; |             input_echo = true; | ||||||
|  |  | ||||||
|             // decrement remaining sampling budget |             // decrement remaining sampling budget | ||||||
|             --n_remain; |             --n_remain; | ||||||
| @@ -503,14 +503,14 @@ int main(int argc, char ** argv) { | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         // display text |         // display text | ||||||
|         if (!input_noecho) { |         if (input_echo) { | ||||||
|             for (auto id : embd) { |             for (auto id : embd) { | ||||||
|                 printf("%s", llama_token_to_str(ctx, id)); |                 printf("%s", llama_token_to_str(ctx, id)); | ||||||
|             } |             } | ||||||
|             fflush(stdout); |             fflush(stdout); | ||||||
|         } |         } | ||||||
|         // reset color to default if we there is no pending user input |         // reset color to default if we there is no pending user input | ||||||
|         if (!input_noecho && (int)embd_inp.size() == n_consumed) { |         if (input_echo && (int)embd_inp.size() == n_consumed) { | ||||||
|             set_console_color(con_st, CONSOLE_COLOR_DEFAULT); |             set_console_color(con_st, CONSOLE_COLOR_DEFAULT); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @@ -605,7 +605,7 @@ int main(int argc, char ** argv) { | |||||||
|                     n_remain -= line_inp.size(); |                     n_remain -= line_inp.size(); | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
|                 input_noecho = true; // do not echo this again |                 input_echo = false; // do not echo this again | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             if (n_past > 0) { |             if (n_past > 0) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Ron Evans
					Ron Evans