vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix LOG_TEELN and configchecker

Browse source
This commit is contained in:
staviq 2023-08-25 17:41:15 +02:00
parent 4fdcede9ec
commit c8a1118308
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/log.h
View file

@ -244,7 +244,7 @@ enum LogTriState
// LOG macro variants with auto endline. // LOG macro variants with auto endline.
#define LOGLN(...) _LOG(__VA_ARGS__, "\n") #define LOGLN(...) _LOG(__VA_ARGS__, "\n")
#define LOG_TEELN(...) _LOG(__VA_ARGS__, "\n") #define LOG_TEELN(...) _LOG_TEE(__VA_ARGS__, "\n")
// INTERNAL, DO NOT USE // INTERNAL, DO NOT USE
inline FILE *_log_handler1(bool change = false, LogTriState disable = LogTriStateSame, std::string filename = LOG_DEFAULT_FILE_NAME, FILE *target = nullptr) inline FILE *_log_handler1(bool change = false, LogTriState disable = LogTriStateSame, std::string filename = LOG_DEFAULT_FILE_NAME, FILE *target = nullptr)
@ -496,7 +496,9 @@ inline void log_print_usage()
// INTERNAL, DO NOT USE // INTERNAL, DO NOT USE
inline void _log_dump_cmdline(int argc, char **argv) inline void _log_dump_cmdline(int argc, char **argv)
{ {
std::string buf; // TODO:
// Windows doesn't seem to like this somehow
std::string buf{""};
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)
{ {
if (std::string(argv[i]).find(' ') != std::string::npos) if (std::string(argv[i]).find(' ') != std::string::npos)

1
examples/main/main.cpp
View file

@ -238,7 +238,6 @@ int main(int argc, char ** argv) {
guidance_offset = (int)guidance_inp.size() - original_prompt_len; guidance_offset = (int)guidance_inp.size() - original_prompt_len;
LOG("original_prompt_len: %s", LOG_TOSTR(original_prompt_len)) LOG("original_prompt_len: %s", LOG_TOSTR(original_prompt_len))
LOG("guidance_offset: %s", LOG_TOSTR(guidance_offset)) LOG("guidance_offset: %s", LOG_TOSTR(guidance_offset))
} }
const int n_ctx = llama_n_ctx(ctx); const int n_ctx = llama_n_ctx(ctx);