From 917f7bfe99f55f9ee91fe7f4c14e99c13680382f Mon Sep 17 00:00:00 2001
From: stduhpf <stephduh@live.fr>
Date: Thu, 23 Oct 2025 15:35:18 +0200
Subject: [PATCH 1/2] fix: support `--flow-shift` for flux models with default
 pred (#913)

---
 stable-diffusion.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp
index 58fc5ee..84af400 100644
--- a/stable-diffusion.cpp
+++ b/stable-diffusion.cpp
@@ -761,11 +761,14 @@ public:
                 denoiser = std::make_shared<DiscreteFlowDenoiser>(shift);
             } else if (sd_version_is_flux(version)) {
                 LOG_INFO("running in Flux FLOW mode");
-                float shift = 1.0f;  // TODO: validate
-                for (auto pair : model_loader.tensor_storages_types) {
-                    if (pair.first.find("model.diffusion_model.guidance_in.in_layer.weight") != std::string::npos) {
-                        shift = 1.15f;
-                        break;
+                float shift = sd_ctx_params->flow_shift;
+                if (shift == INFINITY) {
+                    shift = 1.0f;  // TODO: validate
+                    for (auto pair : model_loader.tensor_storages_types) {
+                        if (pair.first.find("model.diffusion_model.guidance_in.in_layer.weight") != std::string::npos) {
+                            shift = 1.15f;
+                            break;
+                        }
                     }
                 }
                 denoiser = std::make_shared<FluxFlowDenoiser>(shift);

From 69b9511ce9cf95e492ec36619d686c4e7bf5a53c Mon Sep 17 00:00:00 2001
From: leejet <leejet714@gmail.com>
Date: Fri, 24 Oct 2025 00:32:45 +0800
Subject: [PATCH 2/2] sync: update ggml

---
 ggml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ggml b/ggml
index c538174..2d3876d 160000
--- a/ggml
+++ b/ggml
@@ -1 +1 @@
-Subproject commit c538174d261d8172480f87efcfec8e69aac13ebb
+Subproject commit 2d3876d554551d35c06dccc5852be50d5fd2a275