]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
Fix trying to strip newline from empty prompt and cfg prompt file content (#3534)
authorKerfuffle <redacted>
Sat, 7 Oct 2023 21:31:41 +0000 (15:31 -0600)
committerGitHub <redacted>
Sat, 7 Oct 2023 21:31:41 +0000 (15:31 -0600)
common/common.cpp

index 60b00b5fbb8f1bcbcb4a3bec98360e49ff0b312b..0f55c33a713a7cde065be27c4a204cbc2a4bdd27 100644 (file)
@@ -170,7 +170,7 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
             // store the external file name in params
             params.prompt_file = argv[i];
             std::copy(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>(), back_inserter(params.prompt));
-            if (params.prompt.back() == '\n') {
+            if (!params.prompt.empty() && params.prompt.back() == '\n') {
                 params.prompt.pop_back();
             }
         } else if (arg == "-n" || arg == "--n-predict") {
@@ -295,7 +295,7 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
                 break;
             }
             std::copy(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>(), back_inserter(params.cfg_negative_prompt));
-            if (params.cfg_negative_prompt.back() == '\n') {
+            if (!params.cfg_negative_prompt.empty() && params.cfg_negative_prompt.back() == '\n') {
                 params.cfg_negative_prompt.pop_back();
             }
         } else if (arg == "--cfg-scale") {