happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace fprintf with LOG_ERR

This commit is contained in:
syedshazli 2025-12-22 18:34:08 -05:00
parent 76b2c4f4d7
commit 2b8983cf84
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/tokenize/tokenize.cpp
View File

@ -48,14 +48,14 @@ static std::string read_prompt_from_file(const char * filepath, bool & success)
std::ifstream in(filepath, std::ios::binary); std::ifstream in(filepath, std::ios::binary);
if (!in) { if (!in) {
fprintf(stderr, "%s: could not open file '%s' for reading: %s\n", __func__, filepath, strerror(errno)); LOG_ERR("%s: could not open file '%s' for reading: %s\n", __func__, filepath, strerror(errno));
return std::string(); return std::string();
} }
// do not assume the file is seekable (e.g. /dev/stdin) // do not assume the file is seekable (e.g. /dev/stdin)
std::stringstream buffer; std::stringstream buffer;
buffer << in.rdbuf(); buffer << in.rdbuf();
if (in.fail()) { if (in.fail()) {
fprintf(stderr, "%s: could not read the entire file '%s': %s\n", __func__, filepath, strerror(errno)); LOG_ERR("%s: could not read the entire file '%s': %s\n", __func__, filepath, strerror(errno));
return std::string(); return std::string();
} }
@ -226,7 +226,7 @@ int main(int raw_argc, char ** raw_argv) {
} }
else if (arg == "-m" || arg == "--model") { else if (arg == "-m" || arg == "--model") {
if (model_path_set) { if (model_path_set) {
fprintf(stderr, "Error: -m or --model specified multiple times.\n"); LOG_ERR("Error: -m or --model specified multiple times.\n");
return 1; return 1;
} }
model_path = argv[++iarg].c_str(); model_path = argv[++iarg].c_str();
@ -243,7 +243,7 @@ int main(int raw_argc, char ** raw_argv) {
} }
else if (arg == "-p" || arg == "--prompt") { else if (arg == "-p" || arg == "--prompt") {
if (prompt_set) { if (prompt_set) {
fprintf(stderr, "Error: -p or --prompt specified multiple times.\n"); LOG_ERR("Error: -p or --prompt specified multiple times.\n");
return 1; return 1;
} }
prompt_arg = argv[++iarg].c_str(); prompt_arg = argv[++iarg].c_str();
@ -251,7 +251,7 @@ int main(int raw_argc, char ** raw_argv) {
} }
else if (arg == "-f" || arg == "--file") { else if (arg == "-f" || arg == "--file") {
if (prompt_path_set) { if (prompt_path_set) {
fprintf(stderr, "Error: -f or --file specified multiple times.\n"); LOG_ERR("Error: -f or --file specified multiple times.\n");
return 1; return 1;
} }
prompt_path = argv[++iarg].c_str(); prompt_path = argv[++iarg].c_str();
@ -267,7 +267,7 @@ int main(int raw_argc, char ** raw_argv) {
show_token_count = true; show_token_count = true;
} }
else { else {
fprintf(stderr, "Error: unknown option '%s'\n", argv[iarg].c_str()); LOG_ERR("Error: unknown option '%s'\n", argv[iarg].c_str());
return 1; return 1;
} }
} }
@ -278,29 +278,29 @@ int main(int raw_argc, char ** raw_argv) {
// Check that we have the required stuff set. // Check that we have the required stuff set.
if (model_path_set && model_path == NULL) { if (model_path_set && model_path == NULL) {
fprintf(stderr, "Error: --model requires an argument.\n"); LOG_ERR("Error: --model requires an argument.\n");
return 1; return 1;
} }
if (!model_path_set) { if (!model_path_set) {
fprintf(stderr, "Error: must specify --model.\n"); LOG_ERR("Error: must specify --model.\n");
return 1; return 1;
} }
if (prompt_path_set && prompt_path == NULL) { if (prompt_path_set && prompt_path == NULL) {
fprintf(stderr, "Error: --file requires an argument.\n"); LOG_ERR("Error: --file requires an argument.\n");
return 1; return 1;
} }
if (prompt_set && prompt_arg == NULL) { if (prompt_set && prompt_arg == NULL) {
fprintf(stderr, "Error: --prompt requires an argument.\n"); LOG_ERR("Error: --prompt requires an argument.\n");
return 1; return 1;
} }
const int prompts_set = !!(prompt_path_set) + !!(prompt_set) + !!(stdin_set); const int prompts_set = !!(prompt_path_set) + !!(prompt_set) + !!(stdin_set);
if (prompts_set > 1) { if (prompts_set > 1) {
fprintf(stderr, "Error: --stdin, --file and --prompt are mutually exclusive.\n"); LOG_ERR("Error: --stdin, --file and --prompt are mutually exclusive.\n");
return 1; return 1;
} }
// Must have some prompt. // Must have some prompt.
if (prompts_set == 0) { if (prompts_set == 0) {
fprintf(stderr, "Error: must specify one of: --stdin, --file or --prompt.\n"); LOG_ERR("Error: must specify one of: --stdin, --file or --prompt.\n");
return 1; return 1;
} }
@ -340,7 +340,7 @@ int main(int raw_argc, char ** raw_argv) {
model_params.vocab_only = true; model_params.vocab_only = true;
llama_model * model = llama_model_load_from_file(model_path, model_params); llama_model * model = llama_model_load_from_file(model_path, model_params);
if (!model) { if (!model) {
fprintf(stderr, "Error: could not load model from file '%s'.\n", model_path); LOG_ERR("Error: could not load model from file '%s'.\n", model_path);
return 1; return 1;
} }
@ -349,7 +349,7 @@ int main(int raw_argc, char ** raw_argv) {
llama_context_params ctx_params = llama_context_default_params(); llama_context_params ctx_params = llama_context_default_params();
llama_context * ctx = llama_init_from_model(model, ctx_params); llama_context * ctx = llama_init_from_model(model, ctx_params);
if (!ctx) { if (!ctx) {
fprintf(stderr, "Error: could not create context.\n"); LOG_ERR("Error: could not create context.\n");
return 1; return 1;
} }
@ -360,7 +360,7 @@ int main(int raw_argc, char ** raw_argv) {
std::stringstream stdin_buffer; std::stringstream stdin_buffer;
stdin_buffer << std::cin.rdbuf(); stdin_buffer << std::cin.rdbuf();
if (std::cin.fail()) { if (std::cin.fail()) {
fprintf(stderr, "Error: could not read the entire standard input.\n"); LOG_ERR("Error: could not read the entire standard input.\n");
return 1; return 1;
} }