vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-11 17:44:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

tweak sd logging, show progress normally

Browse source
This commit is contained in:
Concedo 2024-03-10 11:45:11 +08:00
parent c08d7e5042
commit 6990d07a26
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
otherarch/sdcpp/sdtype_adapter.cpp
View file

@ -179,7 +179,7 @@ bool sdtype_load_model(const sd_load_model_inputs inputs) {
sddebugmode = inputs.debugmode; sddebugmode = inputs.debugmode;
set_log_message(sddebugmode==1); set_sd_log_level(sddebugmode);
bool vae_decode_only = false; bool vae_decode_only = false;
bool free_param = false; bool free_param = false;

14
otherarch/sdcpp/util.cpp
View file

@ -207,12 +207,12 @@ std::string path_join(const std::string& p1, const std::string& p2) {
return p1 + "/" + p2; return p1 + "/" + p2;
} }
static bool do_log = true; static int sdloglevel = 0; //-1 = hide all, 0 = normal, 1 = showall
void pretty_progress(int step, int steps, float time) { void pretty_progress(int step, int steps, float time) {
if (step == 0) { if (step == 0) {
return; return;
} }
if(!do_log) if(sdloglevel<0)
{ {
return; return;
} }
@ -262,7 +262,7 @@ void* sd_log_cb_data = NULL;
#define LOG_BUFFER_SIZE 1024 #define LOG_BUFFER_SIZE 1024
void log_message(const char* format, ...) { void log_message(const char* format, ...) {
if (do_log) { if (sdloglevel>0) {
printf("\n"); printf("\n");
va_list args; va_list args;
va_start(args, format); va_start(args, format);
@ -271,13 +271,13 @@ void log_message(const char* format, ...) {
fflush(stdout); fflush(stdout);
} }
} }
void set_log_message(bool log) void set_sd_log_level(int log)
{ {
do_log = log; sdloglevel = log;
} }
bool get_log_message() bool get_sd_log_level()
{ {
return do_log; return sdloglevel;
} }
void log_printf(sd_log_level_t level, const char* file, int line, const char* format, ...) { void log_printf(sd_log_level_t level, const char* file, int line, const char* format, ...) {

4
otherarch/sdcpp/util.h
View file

@ -45,8 +45,8 @@ void log_printf(sd_log_level_t level, const char* file, int line, const char* fo
std::string trim(const std::string& s); std::string trim(const std::string& s);
void log_message(const char* format, ...); void log_message(const char* format, ...);
void set_log_message(bool log); void set_sd_log_level(int log);
bool get_log_message(); bool get_sd_log_level();
#define LOG_DEBUG(...) log_message(__VA_ARGS__) #define LOG_DEBUG(...) log_message(__VA_ARGS__)
#define LOG_INFO(...) log_message(__VA_ARGS__) #define LOG_INFO(...) log_message(__VA_ARGS__)
#define LOG_WARN(...) log_message(__VA_ARGS__) #define LOG_WARN(...) log_message(__VA_ARGS__)