From e2b617104d17f0b5a949291fd90ea68e948110af Mon Sep 17 00:00:00 2001 From: localai-org-maint-bot Date: Sat, 26 Sep 2026 17:19:13 +0200 Subject: [PATCH] chore: :arrow_up: Update leejet/stable-diffusion.cpp to `2f886889e6e8b78738d6b87f7191f6018557c551` (#12274) * :arrow_up: Update leejet/stable-diffusion.cpp Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix(stablediffusion-ggml): adapt to upstream tiling struct rename Upstream commit 2f88688 renamed the sd_tiling_params_t fields from tile_size_x/y to tile_size_w/h and rel_size_x/y to rel_size_w/h. Update the gosd.cpp wrappers to match so the C++ backend compiles. --------- Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: mudler <2420543+mudler@users.noreply.github.com> Co-authored-by: Ettore Di Giacinto --- backend/go/stablediffusion-ggml/Makefile | 2 +- backend/go/stablediffusion-ggml/cpp/gosd.cpp | 12 ++++++------ backend/go/stablediffusion-ggml/cpp/gosd.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/go/stablediffusion-ggml/Makefile b/backend/go/stablediffusion-ggml/Makefile index 15ffb569e..6c5e70484 100644 --- a/backend/go/stablediffusion-ggml/Makefile +++ b/backend/go/stablediffusion-ggml/Makefile @@ -8,7 +8,7 @@ JOBS?=$(shell nproc --ignore=1) # stablediffusion.cpp (ggml) STABLEDIFFUSION_GGML_REPO?=https://github.com/leejet/stable-diffusion.cpp -STABLEDIFFUSION_GGML_VERSION?=b167b942f77ecb17e7f78e163a8c32ff7ac95c10 +STABLEDIFFUSION_GGML_VERSION?=2f886889e6e8b78738d6b87f7191f6018557c551 CMAKE_ARGS+=-DGGML_MAX_NAME=128 diff --git a/backend/go/stablediffusion-ggml/cpp/gosd.cpp b/backend/go/stablediffusion-ggml/cpp/gosd.cpp index 4a1911015..74b2a0387 100644 --- a/backend/go/stablediffusion-ggml/cpp/gosd.cpp +++ b/backend/go/stablediffusion-ggml/cpp/gosd.cpp @@ -710,14 +710,14 @@ void sd_tiling_params_set_enabled(sd_tiling_params_t *params, bool enabled) { params->enabled = enabled; } -void sd_tiling_params_set_tile_sizes(sd_tiling_params_t *params, int tile_size_x, int tile_size_y) { - params->tile_size_x = tile_size_x; - params->tile_size_y = tile_size_y; +void sd_tiling_params_set_tile_sizes(sd_tiling_params_t *params, int tile_size_w, int tile_size_h) { + params->tile_size_w = tile_size_w; + params->tile_size_h = tile_size_h; } -void sd_tiling_params_set_rel_sizes(sd_tiling_params_t *params, float rel_size_x, float rel_size_y) { - params->rel_size_x = rel_size_x; - params->rel_size_y = rel_size_y; +void sd_tiling_params_set_rel_sizes(sd_tiling_params_t *params, float rel_size_w, float rel_size_h) { + params->rel_size_w = rel_size_w; + params->rel_size_h = rel_size_h; } void sd_tiling_params_set_target_overlap(sd_tiling_params_t *params, float target_overlap) { diff --git a/backend/go/stablediffusion-ggml/cpp/gosd.h b/backend/go/stablediffusion-ggml/cpp/gosd.h index 31ce72ab7..c6613d4ed 100644 --- a/backend/go/stablediffusion-ggml/cpp/gosd.h +++ b/backend/go/stablediffusion-ggml/cpp/gosd.h @@ -6,8 +6,8 @@ extern "C" { #endif void sd_tiling_params_set_enabled(sd_tiling_params_t *params, bool enabled); -void sd_tiling_params_set_tile_sizes(sd_tiling_params_t *params, int tile_size_x, int tile_size_y); -void sd_tiling_params_set_rel_sizes(sd_tiling_params_t *params, float rel_size_x, float rel_size_y); +void sd_tiling_params_set_tile_sizes(sd_tiling_params_t *params, int tile_size_w, int tile_size_h); +void sd_tiling_params_set_rel_sizes(sd_tiling_params_t *params, float rel_size_w, float rel_size_h); void sd_tiling_params_set_target_overlap(sd_tiling_params_t *params, float target_overlap); sd_tiling_params_t* sd_img_gen_params_get_vae_tiling_params(sd_img_gen_params_t *params);