common : make build info output stream configurable (#28322)
Let llama_print_build_info write to a caller-provided FILE* instead of hardcoding stderr. The parameter defaults to stderr so existing callers keep their current behavior. The version command in llama-app now passes stdout, so plain version output goes to stdout where users expect it. Signed-off-by: Adrien Gallouët <angt@huggingface.co>
This commit is contained in:
+1
-1
@@ -80,7 +80,7 @@ static const command cmds[] = {
|
|||||||
#undef UPDATE_HIDDEN
|
#undef UPDATE_HIDDEN
|
||||||
|
|
||||||
static int version(int /*argc*/, char ** /*argv*/) {
|
static int version(int /*argc*/, char ** /*argv*/) {
|
||||||
llama_print_build_info(llama_version());
|
llama_print_build_info(llama_version(), stdout);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ const char * llama_build_info(void) {
|
|||||||
return s.c_str();
|
return s.c_str();
|
||||||
}
|
}
|
||||||
|
|
||||||
void llama_print_build_info(const char * llama_version) {
|
void llama_print_build_info(const char * llama_version, FILE * stream) {
|
||||||
fprintf(stderr, "version: %s (build %d, commit %s)\n", llama_version, llama_build_number(), llama_commit());
|
fprintf(stream, "version: %s (build %d, commit %s)\n", llama_version, llama_build_number(), llama_commit());
|
||||||
fprintf(stderr, "built with %s for %s\n", llama_compiler(), llama_build_target());
|
fprintf(stream, "built with %s for %s\n", llama_compiler(), llama_build_target());
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-1
@@ -1,5 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdio>
|
||||||
|
|
||||||
int llama_build_number(void);
|
int llama_build_number(void);
|
||||||
|
|
||||||
const char * llama_commit(void);
|
const char * llama_commit(void);
|
||||||
@@ -8,4 +10,4 @@ const char * llama_compiler(void);
|
|||||||
const char * llama_build_target(void);
|
const char * llama_build_target(void);
|
||||||
const char * llama_build_info(void);
|
const char * llama_build_info(void);
|
||||||
|
|
||||||
void llama_print_build_info(const char *);
|
void llama_print_build_info(const char *, FILE * = stderr);
|
||||||
|
|||||||
Reference in New Issue
Block a user