alphard/stable-diffusion.cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove default variables in c headers (#478)

Browse Source
This commit is contained in:
stduhpf 2024-11-24 11:10:25 +01:00 committed by GitHub
parent c3eeb669cd
commit 53b415f787
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/cli/main.cpp
View File

@ -926,7 +926,8 @@ int main(int argc, const char* argv[]) {
params.style_ratio, params.style_ratio,
params.normalize_input, params.normalize_input,
params.input_id_images_path.c_str(), params.input_id_images_path.c_str(),
params.skip_layers, params.skip_layers.data(),
params.skip_layers.size(),
params.slg_scale, params.slg_scale,
params.skip_layer_start, params.skip_layer_start,
params.skip_layer_end); params.skip_layer_end);
@ -991,7 +992,12 @@ int main(int argc, const char* argv[]) {
params.control_strength, params.control_strength,
params.style_ratio, params.style_ratio,
params.normalize_input, params.normalize_input,
params.input_id_images_path.c_str()); params.input_id_images_path.c_str(),
params.skip_layers.data(),
params.skip_layers.size(),
params.slg_scale,
params.skip_layer_start,
params.skip_layer_end);
} }
} }

28
stable-diffusion.cpp
View File

@ -780,7 +780,7 @@ public:
int start_merge_step, int start_merge_step,
SDCondition id_cond, SDCondition id_cond,
std::vector<int> skip_layers = {}, std::vector<int> skip_layers = {},
float slg_scale = 2.5, float slg_scale = 0,
float skip_layer_start = 0.01, float skip_layer_start = 0.01,
float skip_layer_end = 0.2) { float skip_layer_end = 0.2) {
size_t steps = sigmas.size() - 1; size_t steps = sigmas.size() - 1;
@ -1162,7 +1162,7 @@ sd_image_t* generate_image(sd_ctx_t* sd_ctx,
bool normalize_input, bool normalize_input,
std::string input_id_images_path, std::string input_id_images_path,
std::vector<int> skip_layers = {}, std::vector<int> skip_layers = {},
float slg_scale = 2.5, float slg_scale = 0,
float skip_layer_start = 0.01, float skip_layer_start = 0.01,
float skip_layer_end = 0.2) { float skip_layer_end = 0.2) {
if (seed < 0) { if (seed < 0) {
@ -1453,10 +1453,12 @@ sd_image_t* txt2img(sd_ctx_t* sd_ctx,
float style_ratio, float style_ratio,
bool normalize_input, bool normalize_input,
const char* input_id_images_path_c_str, const char* input_id_images_path_c_str,
std::vector<int> skip_layers, int* skip_layers = NULL,
float slg_scale, size_t skip_layers_count = 0,
float skip_layer_start, float slg_scale = 0,
float skip_layer_end) { float skip_layer_start = 0.01,
float skip_layer_end = 0.2) {
std::vector<int> skip_layers_vec(skip_layers, skip_layers + skip_layers_count);
LOG_DEBUG("txt2img %dx%d", width, height); LOG_DEBUG("txt2img %dx%d", width, height);
if (sd_ctx == NULL) { if (sd_ctx == NULL) {
return NULL; return NULL;
@ -1525,7 +1527,7 @@ sd_image_t* txt2img(sd_ctx_t* sd_ctx,
style_ratio, style_ratio,
normalize_input, normalize_input,
input_id_images_path_c_str, input_id_images_path_c_str,
skip_layers, skip_layers_vec,
slg_scale, slg_scale,
skip_layer_start, skip_layer_start,
skip_layer_end); skip_layer_end);
@ -1556,10 +1558,12 @@ sd_image_t* img2img(sd_ctx_t* sd_ctx,
float style_ratio, float style_ratio,
bool normalize_input, bool normalize_input,
const char* input_id_images_path_c_str, const char* input_id_images_path_c_str,
std::vector<int> skip_layers, int* skip_layers = NULL,
float slg_scale, size_t skip_layers_count = 0,
float skip_layer_start, float slg_scale = 0,
float skip_layer_end) { float skip_layer_start = 0.01,
float skip_layer_end = 0.2) {
std::vector<int> skip_layers_vec(skip_layers, skip_layers + skip_layers_count);
LOG_DEBUG("img2img %dx%d", width, height); LOG_DEBUG("img2img %dx%d", width, height);
if (sd_ctx == NULL) { if (sd_ctx == NULL) {
return NULL; return NULL;
@ -1634,7 +1638,7 @@ sd_image_t* img2img(sd_ctx_t* sd_ctx,
style_ratio, style_ratio,
normalize_input, normalize_input,
input_id_images_path_c_str, input_id_images_path_c_str,
skip_layers, skip_layers_vec,
slg_scale, slg_scale,
skip_layer_start, skip_layer_start,
skip_layer_end); skip_layer_end);

18
stable-diffusion.h
View File

@ -166,10 +166,11 @@ SD_API sd_image_t* txt2img(sd_ctx_t* sd_ctx,
float style_strength, float style_strength,
bool normalize_input, bool normalize_input,
const char* input_id_images_path, const char* input_id_images_path,
std::vector<int> skip_layers = {}, int* skip_layers,
float slg_scale = 2.5, size_t skip_layers_count,
float skip_layer_start = 0.01, float slg_scale,
float skip_layer_end = 0.2); float skip_layer_start,
float skip_layer_end);
SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx, SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx,
sd_image_t init_image, sd_image_t init_image,
@ -190,10 +191,11 @@ SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx,
float style_strength, float style_strength,
bool normalize_input, bool normalize_input,
const char* input_id_images_path, const char* input_id_images_path,
std::vector<int> skip_layers = {}, int* skip_layers,
float slg_scale = 2.5, size_t skip_layers_count,
float skip_layer_start = 0.01, float slg_scale,
float skip_layer_end = 0.2); float skip_layer_start,
float skip_layer_end);
SD_API sd_image_t* img2vid(sd_ctx_t* sd_ctx, SD_API sd_image_t* img2vid(sd_ctx_t* sd_ctx,
sd_image_t init_image, sd_image_t init_image,