DarthAffe/stable-diffusion.cpp
1
0
Fork 0
mirror of https://github.com/leejet/stable-diffusion.cpp.git synced 2025-12-12 21:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: deal with default img-cfg-scale at the library level (#869)

Browse Source
This commit is contained in:
Wagner Bruna 2025-10-12 12:17:52 -03:00 committed by GitHub
parent 5b261b9cee
commit aa68b875b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/cli/main.cpp
View File

@ -906,14 +906,6 @@ void parse_args(int argc, const char** argv, SDParams& params) {
params.output_path = "output.gguf"; params.output_path = "output.gguf";
} }
} }
if (!isfinite(params.sample_params.guidance.img_cfg)) {
params.sample_params.guidance.img_cfg = params.sample_params.guidance.txt_cfg;
}
if (!isfinite(params.high_noise_sample_params.guidance.img_cfg)) {
params.high_noise_sample_params.guidance.img_cfg = params.high_noise_sample_params.guidance.txt_cfg;
}
} }
static std::string sd_basename(const std::string& path) { static std::string sd_basename(const std::string& path) {

10
stable-diffusion.cpp
View File

@ -1071,7 +1071,7 @@ public:
std::vector<int> skip_layers(guidance.slg.layers, guidance.slg.layers + guidance.slg.layer_count); std::vector<int> skip_layers(guidance.slg.layers, guidance.slg.layers + guidance.slg.layer_count);
float cfg_scale = guidance.txt_cfg; float cfg_scale = guidance.txt_cfg;
float img_cfg_scale = guidance.img_cfg; float img_cfg_scale = isfinite(guidance.img_cfg) ? guidance.img_cfg : guidance.txt_cfg;
float slg_scale = guidance.slg.scale; float slg_scale = guidance.slg.scale;
if (img_cfg_scale != cfg_scale && !sd_version_is_inpaint_or_unet_edit(version)) { if (img_cfg_scale != cfg_scale && !sd_version_is_inpaint_or_unet_edit(version)) {
@ -1775,7 +1775,9 @@ char* sd_sample_params_to_str(const sd_sample_params_t* sample_params) {
"eta: %.2f, " "eta: %.2f, "
"shifted_timestep: %d)", "shifted_timestep: %d)",
sample_params->guidance.txt_cfg, sample_params->guidance.txt_cfg,
sample_params->guidance.img_cfg, isfinite(sample_params->guidance.img_cfg)
? sample_params->guidance.img_cfg
: sample_params->guidance.txt_cfg,
sample_params->guidance.distilled_guidance, sample_params->guidance.distilled_guidance,
sample_params->guidance.slg.layer_count, sample_params->guidance.slg.layer_count,
sample_params->guidance.slg.layer_start, sample_params->guidance.slg.layer_start,
@ -1936,6 +1938,10 @@ sd_image_t* generate_image_internal(sd_ctx_t* sd_ctx,
seed = rand(); seed = rand();
} }
if (!isfinite(guidance.img_cfg)) {
guidance.img_cfg = guidance.txt_cfg;
}
// for (auto v : sigmas) { // for (auto v : sigmas) {
// std::cout << v << " "; // std::cout << v << " ";
// } // }