From 1683c8a090c3efc51c43107d5ede0dcd5d506e3b Mon Sep 17 00:00:00 2001
From: Ferenc Szontágh <szf@fsociety.hu>
Date: Sun, 04 Feb 2024 20:45:08 +0000
Subject: [PATCH] added better queue manager, some clean-up and new feature: model management (wip), progressbar
---
external/stable-diffusion.cpp/include/stable-diffusion.h | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/external/stable-diffusion.cpp/include/stable-diffusion.h b/external/stable-diffusion.cpp/include/stable-diffusion.h
index afd3b0f..a003328 100644
--- a/external/stable-diffusion.cpp/include/stable-diffusion.h
+++ b/external/stable-diffusion.cpp/include/stable-diffusion.h
@@ -65,12 +65,12 @@
SD_TYPE_Q8_0 = 8,
SD_TYPE_Q8_1 = 9,
// k-quantizations
- SD_TYPE_Q2_K = 10,
- SD_TYPE_Q3_K = 11,
- SD_TYPE_Q4_K = 12,
- SD_TYPE_Q5_K = 13,
- SD_TYPE_Q6_K = 14,
- SD_TYPE_Q8_K = 15,
+ SD_TYPE_Q2_K = 10,
+ SD_TYPE_Q3_K = 11,
+ SD_TYPE_Q4_K = 12,
+ SD_TYPE_Q5_K = 13,
+ SD_TYPE_Q6_K = 14,
+ SD_TYPE_Q8_K = 15,
SD_TYPE_IQ2_XXS = 16,
SD_TYPE_I8,
SD_TYPE_I16,
@@ -88,8 +88,10 @@
};
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();
@@ -105,14 +107,17 @@
SD_API sd_ctx_t* new_sd_ctx(const char* model_path,
const char* vae_path,
const char* taesd_path,
+ const char* control_net_path_c_str,
const char* lora_model_dir,
+ const char* embed_dir_c_str,
bool vae_decode_only,
bool vae_tiling,
bool free_params_immediately,
int n_threads,
enum sd_type_t wtype,
enum rng_type_t rng_type,
- enum schedule_t s);
+ enum schedule_t s,
+ bool keep_control_net_cpu);
SD_API void free_sd_ctx(sd_ctx_t* sd_ctx);
@@ -126,7 +131,9 @@
enum sample_method_t sample_method,
int sample_steps,
int64_t seed,
- int batch_count);
+ int batch_count,
+ const sd_image_t* control_cond,
+ float control_strength);
SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx,
sd_image_t init_image,
--
Gitblit v1.9.3