Skip to content

Commit 53b415f

Browse files
stduhpfstduhpf
authored
fix: remove default variables in c headers (leejet#478)
1 parent c3eeb66 commit 53b415f

File tree

3 files changed

+34
-22
lines changed

3 files changed

+34
-22
lines changed

‎examples/cli/main.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,8 @@ int main(int argc, const char* argv[]) {
926926
params.style_ratio,
927927
params.normalize_input,
928928
params.input_id_images_path.c_str(),
929-
params.skip_layers,
929+
params.skip_layers.data(),
930+
params.skip_layers.size(),
930931
params.slg_scale,
931932
params.skip_layer_start,
932933
params.skip_layer_end);
@@ -991,7 +992,12 @@ int main(int argc, const char* argv[]) {
991992
params.control_strength,
992993
params.style_ratio,
993994
params.normalize_input,
994-
params.input_id_images_path.c_str());
995+
params.input_id_images_path.c_str(),
996+
params.skip_layers.data(),
997+
params.skip_layers.size(),
998+
params.slg_scale,
999+
params.skip_layer_start,
1000+
params.skip_layer_end);
9951001
}
9961002
}
9971003

‎stable-diffusion.cpp

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ class StableDiffusionGGML {
780780
int start_merge_step,
781781
SDCondition id_cond,
782782
std::vector<int> skip_layers = {},
783-
float slg_scale = 2.5,
783+
float slg_scale = 0,
784784
float skip_layer_start = 0.01,
785785
float skip_layer_end = 0.2) {
786786
size_t steps = sigmas.size() - 1;
@@ -1162,7 +1162,7 @@ sd_image_t* generate_image(sd_ctx_t* sd_ctx,
11621162
bool normalize_input,
11631163
std::string input_id_images_path,
11641164
std::vector<int> skip_layers = {},
1165-
float slg_scale = 2.5,
1165+
float slg_scale = 0,
11661166
float skip_layer_start = 0.01,
11671167
float skip_layer_end = 0.2) {
11681168
if (seed < 0) {
@@ -1453,10 +1453,12 @@ sd_image_t* txt2img(sd_ctx_t* sd_ctx,
14531453
float style_ratio,
14541454
bool normalize_input,
14551455
const char* input_id_images_path_c_str,
1456-
std::vector<int> skip_layers,
1457-
float slg_scale,
1458-
float skip_layer_start,
1459-
float skip_layer_end) {
1456+
int* skip_layers = NULL,
1457+
size_t skip_layers_count = 0,
1458+
float slg_scale = 0,
1459+
float skip_layer_start = 0.01,
1460+
float skip_layer_end = 0.2) {
1461+
std::vector<int> skip_layers_vec(skip_layers, skip_layers + skip_layers_count);
14601462
LOG_DEBUG("txt2img %dx%d", width, height);
14611463
if (sd_ctx == NULL) {
14621464
return NULL;
@@ -1525,7 +1527,7 @@ sd_image_t* txt2img(sd_ctx_t* sd_ctx,
15251527
style_ratio,
15261528
normalize_input,
15271529
input_id_images_path_c_str,
1528-
skip_layers,
1530+
skip_layers_vec,
15291531
slg_scale,
15301532
skip_layer_start,
15311533
skip_layer_end);
@@ -1556,10 +1558,12 @@ sd_image_t* img2img(sd_ctx_t* sd_ctx,
15561558
float style_ratio,
15571559
bool normalize_input,
15581560
const char* input_id_images_path_c_str,
1559-
std::vector<int> skip_layers,
1560-
float slg_scale,
1561-
float skip_layer_start,
1562-
float skip_layer_end) {
1561+
int* skip_layers = NULL,
1562+
size_t skip_layers_count = 0,
1563+
float slg_scale = 0,
1564+
float skip_layer_start = 0.01,
1565+
float skip_layer_end = 0.2) {
1566+
std::vector<int> skip_layers_vec(skip_layers, skip_layers + skip_layers_count);
15631567
LOG_DEBUG("img2img %dx%d", width, height);
15641568
if (sd_ctx == NULL) {
15651569
return NULL;
@@ -1634,7 +1638,7 @@ sd_image_t* img2img(sd_ctx_t* sd_ctx,
16341638
style_ratio,
16351639
normalize_input,
16361640
input_id_images_path_c_str,
1637-
skip_layers,
1641+
skip_layers_vec,
16381642
slg_scale,
16391643
skip_layer_start,
16401644
skip_layer_end);

‎stable-diffusion.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,11 @@ SD_API sd_image_t* txt2img(sd_ctx_t* sd_ctx,
166166
float style_strength,
167167
bool normalize_input,
168168
const char* input_id_images_path,
169-
std::vector<int> skip_layers = {},
170-
float slg_scale = 2.5,
171-
float skip_layer_start = 0.01,
172-
float skip_layer_end = 0.2);
169+
int* skip_layers,
170+
size_t skip_layers_count,
171+
float slg_scale,
172+
float skip_layer_start,
173+
float skip_layer_end);
173174

174175
SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx,
175176
sd_image_t init_image,
@@ -190,10 +191,11 @@ SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx,
190191
float style_strength,
191192
bool normalize_input,
192193
const char* input_id_images_path,
193-
std::vector<int> skip_layers = {},
194-
float slg_scale = 2.5,
195-
float skip_layer_start = 0.01,
196-
float skip_layer_end = 0.2);
194+
int* skip_layers,
195+
size_t skip_layers_count,
196+
float slg_scale,
197+
float skip_layer_start,
198+
float skip_layer_end);
197199

198200
SD_API sd_image_t* img2vid(sd_ctx_t* sd_ctx,
199201
sd_image_t init_image,

0 commit comments

Comments
 (0)