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

fix: make weight override more robust against ggml changes (#760)

Browse Source
This commit is contained in:
Wagner Bruna 2025-09-14 01:15:53 -03:00 committed by GitHub
parent 48956ffb87
commit 5869987fe4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model.cpp
View File

@ -2310,7 +2310,7 @@ std::vector<std::pair<std::string, ggml_type>> parse_tensor_type_rules(const std
if (type_name == "f32") { if (type_name == "f32") {
tensor_type = GGML_TYPE_F32; tensor_type = GGML_TYPE_F32;
} else { } 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); auto trait = ggml_get_type_traits((ggml_type)i);
if (trait->to_float && trait->type_size && type_name == trait->type_name) { if (trait->to_float && trait->type_size && type_name == trait->type_name) {
tensor_type = (ggml_type)i; tensor_type = (ggml_type)i;

11
stable-diffusion.cpp
View File

@ -265,7 +265,9 @@ public:
} }
LOG_INFO("Version: %s ", model_version_to_str[version]); 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<int>(SD_TYPE_COUNT, GGML_TYPE_COUNT)
? (ggml_type)sd_ctx_params->wtype
: GGML_TYPE_COUNT;
if (wtype == GGML_TYPE_COUNT) { if (wtype == GGML_TYPE_COUNT) {
model_wtype = model_loader.get_sd_wtype(); model_wtype = model_loader.get_sd_wtype();
if (model_wtype == GGML_TYPE_COUNT) { if (model_wtype == GGML_TYPE_COUNT) {
@ -1465,11 +1467,14 @@ public:
#define NONE_STR "NONE" #define NONE_STR "NONE"
const char* sd_type_name(enum sd_type_t type) { const char* sd_type_name(enum sd_type_t type) {
return ggml_type_name((ggml_type)type); if ((int)type < std::min<int>(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) { 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<int>(SD_TYPE_COUNT, GGML_TYPE_COUNT); i++) {
auto trait = ggml_get_type_traits((ggml_type)i); auto trait = ggml_get_type_traits((ggml_type)i);
if (!strcmp(str, trait->type_name)) { if (!strcmp(str, trait->type_name)) {
return (enum sd_type_t)i; return (enum sd_type_t)i;