Thanks to visit codestin.com
Credit goes to github.com

Skip to content

add progress callback, supress pretty_progress #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 2, 2024
Merged

add progress callback, supress pretty_progress #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
374ace4
add progress callback, supress others
fszontagh Feb 5, 2024
6ee1c65
some error handling at loars and embeddings
fszontagh Feb 10, 2024
0e834e7
formatting mistakes
fszontagh Feb 10, 2024
fc8be44
#175 #154 #141 - remove lora mapping which is disallow to release ram
fszontagh Feb 15, 2024
1917d85
Merge branch 'master' into progress_callback
leejet Feb 24, 2024
fecdbcc
restored graphs and buffer sizes
fszontagh Feb 26, 2024
263de2e
Merge branch 'master' into master
fszontagh Feb 26, 2024
af449d3
removed ggml_n_dims_t
fszontagh Feb 27, 2024
254ef8a
Merge branch 'master' into progress_callback
leejet Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions clip.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,10 @@ struct FrozenCLIPEmbedderWithCustomWords : public GGMLModule {
LOG_ERROR("embedding '%s' failed", embd_name.c_str());
return false;
}
if (std::find(readed_embeddings.begin(), readed_embeddings.end(), embd_name) != readed_embeddings.end()) {
LOG_DEBUG("embedding already read in: %s", embd_name.c_str());
return true;
}
struct ggml_init_params params;
params.mem_size = 10 * 1024 * 1024; // max for custom embeddings 10 MB
params.mem_buffer = NULL;
Expand Down
3 changes: 3 additions & 0 deletions lora.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ struct LoraModel : public GGMLModule {
return model_loader.get_params_mem_size(NULL);
}


bool load_from_file() {
LOG_INFO("loading LoRA from '%s'", file_path.c_str());

Expand All @@ -55,6 +56,7 @@ struct LoraModel : public GGMLModule {
auto real = lora_tensors[name];
*dst_tensor = real;
}

return true;
};

Expand All @@ -64,6 +66,7 @@ struct LoraModel : public GGMLModule {
dry_run = false;
model_loader.load_tensors(on_new_tensor_cb, backend);


LOG_DEBUG("finished loaded lora");
return true;
}
Expand Down
2 changes: 2 additions & 0 deletions stable-diffusion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,10 @@ enum sd_log_level_t {
};

typedef void (*sd_log_cb_t)(enum sd_log_level_t level, const char* text, void* data);
typedef void (*sd_progress_cb_t)(int step,int steps,float time, void* data);

SD_API void sd_set_log_callback(sd_log_cb_t sd_log_cb, void* data);
SD_API void sd_set_progress_callback(sd_progress_cb_t cb, void* data);
SD_API int32_t get_num_physical_cores();
SD_API const char* sd_get_system_info();

Expand Down
17 changes: 14 additions & 3 deletions util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ int32_t get_num_physical_cores() {
return n_threads > 0 ? (n_threads <= 4 ? n_threads : n_threads / 2) : 4;
}

static sd_progress_cb_t sd_progress_cb = NULL;
void* sd_progress_cb_data = NULL;

std::u32string utf8_to_utf32(const std::string& utf8_str) {
std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter;
return converter.from_bytes(utf8_str);
Expand Down Expand Up @@ -205,6 +208,10 @@ std::string path_join(const std::string& p1, const std::string& p2) {
}

void pretty_progress(int step, int steps, float time) {
if (sd_progress_cb) {
sd_progress_cb(step,steps,time, sd_progress_cb_data);
return;
}
if (step == 0) {
return;
}
Expand Down Expand Up @@ -248,8 +255,9 @@ std::string trim(const std::string& s) {
return rtrim(ltrim(s));
}

static sd_log_cb_t sd_log_cb = NULL;
void* sd_log_cb_data = NULL;
static sd_log_cb_t sd_log_cb = NULL;
void* sd_log_cb_data = NULL;


#define LOG_BUFFER_SIZE 1024

Expand Down Expand Up @@ -286,7 +294,10 @@ void sd_set_log_callback(sd_log_cb_t cb, void* data) {
sd_log_cb = cb;
sd_log_cb_data = data;
}

void sd_set_progress_callback(sd_progress_cb_t cb, void* data) {
sd_progress_cb = cb;
sd_progress_cb_data = data;
}
const char* sd_get_system_info() {
static char buffer[1024];
std::stringstream ss;
Expand Down
2 changes: 1 addition & 1 deletion vae.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/*================================================== AutoEncoderKL ===================================================*/

#define VAE_GRAPH_SIZE 10240
#define VAE_GRAPH_SIZE 20480

class ResnetBlock : public UnaryBlock {
protected:
Expand Down