From 218f0be70de4dd0b88424c65f63d640b3c3f8a55 Mon Sep 17 00:00:00 2001 From: localai-bot Date: Fri, 6 Mar 2026 16:43:35 +0000 Subject: [PATCH 1/5] chore: :arrow_up: Update leejet/stable-diffusion.cpp to d95062737e4bd72060595220c5545cce1b049af9 - Update STABLEDIFFUSION_GGML_VERSION to d95062737e4bd72060595220c5545cce1b049af9 - Add res_multistep and res_2s sample methods - Add bong_tangent scheduler Signed-off-by: localai-bot --- backend/go/stablediffusion-ggml/Makefile | 2 +- backend/go/stablediffusion-ggml/gosd.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/go/stablediffusion-ggml/Makefile b/backend/go/stablediffusion-ggml/Makefile index e103d6d8de0a..f938e1107df3 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?=e411520407663e1ddf8ff2e5ed4ff3a116fbbc97 +STABLEDIFFUSION_GGML_VERSION?=d95062737e4bd72060595220c5545cce1b049af9 CMAKE_ARGS+=-DGGML_MAX_NAME=128 diff --git a/backend/go/stablediffusion-ggml/gosd.cpp b/backend/go/stablediffusion-ggml/gosd.cpp index 2d8429c4ae10..b2cc42b66d8d 100644 --- a/backend/go/stablediffusion-ggml/gosd.cpp +++ b/backend/go/stablediffusion-ggml/gosd.cpp @@ -39,8 +39,11 @@ const char* sample_method_str[] = { "ipndm", "ipndm_v", "lcm", + "bong_tangent", "ddim_trailing", "tcd", + "res_multistep", + "res_2s", }; static_assert(std::size(sample_method_str) == SAMPLE_METHOD_COUNT, "sample method mismatch"); @@ -57,6 +60,7 @@ const char* schedulers[] = { "smoothstep", "kl_optimal", "lcm", + "bong_tangent", }; static_assert(std::size(schedulers) == SCHEDULER_COUNT, "schedulers mismatch"); From 079eee138b725a69109e1a4abb6b9e3d19633897 Mon Sep 17 00:00:00 2001 From: localai-bot Date: Sat, 7 Mar 2026 03:15:08 +0000 Subject: [PATCH 2/5] fix: remove bong_tangent from sample_method_str to match stable-diffusion.cpp enum --- backend/go/stablediffusion-ggml/gosd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/go/stablediffusion-ggml/gosd.cpp b/backend/go/stablediffusion-ggml/gosd.cpp index b2cc42b66d8d..30aa71689c73 100644 --- a/backend/go/stablediffusion-ggml/gosd.cpp +++ b/backend/go/stablediffusion-ggml/gosd.cpp @@ -39,7 +39,6 @@ const char* sample_method_str[] = { "ipndm", "ipndm_v", "lcm", - "bong_tangent", "ddim_trailing", "tcd", "res_multistep", From ae208c21924c0e9588f9b221c15b14b03822c4b3 Mon Sep 17 00:00:00 2001 From: localai-bot Date: Sat, 7 Mar 2026 04:53:11 +0000 Subject: [PATCH 3/5] fix: remove flow_shift assignment to match upstream stable-diffusion.cpp struct --- backend/go/stablediffusion-ggml/gosd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/go/stablediffusion-ggml/gosd.cpp b/backend/go/stablediffusion-ggml/gosd.cpp index 30aa71689c73..2c6a65358586 100644 --- a/backend/go/stablediffusion-ggml/gosd.cpp +++ b/backend/go/stablediffusion-ggml/gosd.cpp @@ -726,7 +726,6 @@ int load_model(const char *model, char *model_path, char* options[], int threads ctx_params.chroma_use_dit_mask = chroma_use_dit_mask; ctx_params.chroma_use_t5_mask = chroma_use_t5_mask; ctx_params.chroma_t5_mask_pad = chroma_t5_mask_pad; - ctx_params.flow_shift = flow_shift; sd_ctx_t* sd_ctx = new_sd_ctx(&ctx_params); if (sd_ctx == NULL) { From cd5c7924b603f7b5ffc554826546d5dcf226c283 Mon Sep 17 00:00:00 2001 From: localai-bot Date: Sat, 7 Mar 2026 05:21:40 +0000 Subject: [PATCH 4/5] fix: remove flow_shift reference not present in upstream stable-diffusion.cpp The upstream stable-diffusion.cpp library does not have the flow_shift field in sd_ctx_params_t struct. Removing this reference to fix CI build. This also removes the flow_shift variable and option parsing that is no longer needed since the upstream library doesn't support this parameter. --- backend/go/stablediffusion-ggml/gosd.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/go/stablediffusion-ggml/gosd.cpp b/backend/go/stablediffusion-ggml/gosd.cpp index 2c6a65358586..b067e88e8d8c 100644 --- a/backend/go/stablediffusion-ggml/gosd.cpp +++ b/backend/go/stablediffusion-ggml/gosd.cpp @@ -504,7 +504,6 @@ int load_model(const char *model, char *model_path, char* options[], int threads bool chroma_use_dit_mask = true; bool chroma_use_t5_mask = false; int chroma_t5_mask_pad = 1; - float flow_shift = INFINITY; fprintf(stderr, "parsing options: %p\n", options); @@ -594,7 +593,6 @@ int load_model(const char *model, char *model_path, char* options[], int threads if (!strcmp(optname, "n_threads")) n_threads = atoi(optval); if (!strcmp(optname, "chroma_t5_mask_pad")) chroma_t5_mask_pad = atoi(optval); - if (!strcmp(optname, "flow_shift")) flow_shift = atof(optval); if (!strcmp(optname, "rng_type")) { int found = -1; From 5931ec89547c9d0934faaf6abf0f887979e60077 Mon Sep 17 00:00:00 2001 From: localai-bot Date: Sat, 7 Mar 2026 17:34:16 +0000 Subject: [PATCH 5/5] fix: remove res_multistep and res_2s from sample_method_str to match upstream stable-diffusion.cpp enum The upstream stable-diffusion.cpp header has 14 methods but the gosd.cpp was using 14 entries that didn't match. Removing res_multistep and res_2s to align with upstream master version which has 12 sample methods. --- backend/go/stablediffusion-ggml/gosd.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/go/stablediffusion-ggml/gosd.cpp b/backend/go/stablediffusion-ggml/gosd.cpp index b067e88e8d8c..4168ffb9fe4d 100644 --- a/backend/go/stablediffusion-ggml/gosd.cpp +++ b/backend/go/stablediffusion-ggml/gosd.cpp @@ -41,8 +41,6 @@ const char* sample_method_str[] = { "lcm", "ddim_trailing", "tcd", - "res_multistep", - "res_2s", }; static_assert(std::size(sample_method_str) == SAMPLE_METHOD_COUNT, "sample method mismatch");