From d298382ad977ec89c8de7b57459b9d7965d2c272 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 27 May 2024 00:10:17 +1000 Subject: main: replace --no-special with --special (#7534) This also flips the default behavior of the output to not include control token by default. --- examples/main/main.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'examples/main/main.cpp') diff --git a/examples/main/main.cpp b/examples/main/main.cpp index ac35772f..44949ba8 100644 --- a/examples/main/main.cpp +++ b/examples/main/main.cpp @@ -740,16 +740,10 @@ int main(int argc, char ** argv) { // display text if (input_echo && display) { for (auto id : embd) { - const std::string token_str = llama_token_to_piece(ctx, id); + const std::string token_str = llama_token_to_piece(ctx, id, params.special); // Console/Stream Output - if (!llama_token_is_control(llama_get_model(ctx), id)) { - // Stream Output Token To Standard Output - fprintf(stdout, "%s", token_str.c_str()); - } else if (!params.no_special && !params.conversation) { - // Stream Control Token To Standard Output Stream - fprintf(stdout, "%s", token_str.c_str()); - } + fprintf(stdout, "%s", token_str.c_str()); // Record Displayed Tokens To Log // Note: Generated tokens are created one by one hence this check -- cgit v1.2.3