From 1480d816c44a07ace893bef0387a2a502e9559b9 Mon Sep 17 00:00:00 2001 From: Wagner Bruna Date: Thu, 7 Aug 2025 11:18:47 -0300 Subject: [PATCH 1/2] chore: make weight override more robust against ggml changes Recently, GGML_TYPE_COUNT got bumped for the new GGML_TYPE_MXFP4 quant, getting it out-of-sync with SD_TYPE_COUNT. To make it easier to build stable-diffusion.cpp against different ggml versions when other weight types get added to ggml, adjust the type conversions to consider both GGML_TYPE_COUNT and SD_TYPE_COUNT as limits. --- model.cpp | 2 +- stable-diffusion.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/model.cpp b/model.cpp index 4e42018c8..329d092f9 100644 --- a/model.cpp +++ b/model.cpp @@ -2310,7 +2310,7 @@ std::vector> parse_tensor_type_rules(const std if (type_name == "f32") { tensor_type = GGML_TYPE_F32; } else { - for (size_t i = 0; i < SD_TYPE_COUNT; i++) { + for (size_t i = 0; i < GGML_TYPE_COUNT; i++) { auto trait = ggml_get_type_traits((ggml_type)i); if (trait->to_float && trait->type_size && type_name == trait->type_name) { tensor_type = (ggml_type)i; diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp index db4e07cb0..b1a6511f5 100644 --- a/stable-diffusion.cpp +++ b/stable-diffusion.cpp @@ -265,7 +265,9 @@ class StableDiffusionGGML { } LOG_INFO("Version: %s ", model_version_to_str[version]); - ggml_type wtype = (ggml_type)sd_ctx_params->wtype; + ggml_type wtype = (int)sd_ctx_params->wtype < std::min(SD_TYPE_COUNT, GGML_TYPE_COUNT) + ? (ggml_type)sd_ctx_params->wtype + : GGML_TYPE_COUNT; if (wtype == GGML_TYPE_COUNT) { model_wtype = model_loader.get_sd_wtype(); if (model_wtype == GGML_TYPE_COUNT) { @@ -1467,11 +1469,14 @@ class StableDiffusionGGML { #define NONE_STR "NONE" const char* sd_type_name(enum sd_type_t type) { - return ggml_type_name((ggml_type)type); + if ((int) type < std::min(SD_TYPE_COUNT, GGML_TYPE_COUNT)) { + return ggml_type_name((ggml_type)type); + } + return NONE_STR; } enum sd_type_t str_to_sd_type(const char* str) { - for (int i = 0; i < SD_TYPE_COUNT; i++) { + for (int i = 0; i < std::min(SD_TYPE_COUNT, GGML_TYPE_COUNT); i++) { auto trait = ggml_get_type_traits((ggml_type)i); if (!strcmp(str, trait->type_name)) { return (enum sd_type_t)i; From ec3088d3d6d211b7bf4be35e4946ad35e0553504 Mon Sep 17 00:00:00 2001 From: leejet Date: Sun, 14 Sep 2025 12:15:12 +0800 Subject: [PATCH 2/2] format code --- stable-diffusion.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp index b1a6511f5..4ce44a041 100644 --- a/stable-diffusion.cpp +++ b/stable-diffusion.cpp @@ -266,8 +266,8 @@ class StableDiffusionGGML { LOG_INFO("Version: %s ", model_version_to_str[version]); ggml_type wtype = (int)sd_ctx_params->wtype < std::min(SD_TYPE_COUNT, GGML_TYPE_COUNT) - ? (ggml_type)sd_ctx_params->wtype - : GGML_TYPE_COUNT; + ? (ggml_type)sd_ctx_params->wtype + : GGML_TYPE_COUNT; if (wtype == GGML_TYPE_COUNT) { model_wtype = model_loader.get_sd_wtype(); if (model_wtype == GGML_TYPE_COUNT) { @@ -1469,7 +1469,7 @@ class StableDiffusionGGML { #define NONE_STR "NONE" const char* sd_type_name(enum sd_type_t type) { - if ((int) type < std::min(SD_TYPE_COUNT, GGML_TYPE_COUNT)) { + if ((int)type < std::min(SD_TYPE_COUNT, GGML_TYPE_COUNT)) { return ggml_type_name((ggml_type)type); } return NONE_STR;