Skip to content

Commit 22ab6f0

Browse files
committed
Fix model_version_to_str
1 parent 6bdcc83 commit 22ab6f0

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

stable-diffusion.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ const char* model_version_to_str[] = {
3636
"SVD",
3737
"SD3.x",
3838
"Flux",
39-
"Flux Fill"};
39+
"Flux Fill",
40+
"Flux Control",
41+
"Flex.2",
42+
};
4043

4144
const char* sampling_methods_str[] = {
4245
"Euler A",
@@ -815,15 +818,15 @@ class StableDiffusionGGML {
815818
const std::vector<float>& sigmas,
816819
int start_merge_step,
817820
SDCondition id_cond,
818-
ggml_tensor* denoise_mask = NULL) {
821+
ggml_tensor* denoise_mask = NULL) {
819822
std::vector<int> skip_layers(guidance.slg.layers, guidance.slg.layers + guidance.slg.layer_count);
820823

821824
// TODO (Pix2Pix): separate image guidance params (right now it's reusing distilled guidance)
822825

823-
float cfg_scale = guidance.txt_cfg;
826+
float cfg_scale = guidance.txt_cfg;
824827
float img_cfg_scale = guidance.img_cfg;
825-
float slg_scale = guidance.slg.scale;
826-
828+
float slg_scale = guidance.slg.scale;
829+
827830
float min_cfg = guidance.min_cfg;
828831

829832
if (img_cfg_scale != cfg_scale && !sd_version_use_concat(version)) {

0 commit comments

Comments
 (0)