refactor: t5 use cpu if conditioner type != model type

thxCode · thxCode · commit 0469508cd733 · 2024-11-22T19:30:11.000+08:00
Signed-off-by: thxCode &lt;thxcode0824@gmail.com&gt;
diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp
@@ -343,7 +343,7 @@ class StableDiffusionGGML {
             if (version == VERSION_SD3_MEDIUM || version == VERSION_SD3_5_MEDIUM || version == VERSION_SD3_5_LARGE || version == VERSION_FLUX_DEV || version == VERSION_FLUX_SCHNELL) {
                 use_t5xxl = true;
             }
-            if (!ggml_backend_is_cpu(backend) && use_t5xxl && conditioner_wtype < GGML_TYPE_F16) {
+            if (!ggml_backend_is_cpu(backend) && use_t5xxl && conditioner_wtype != diffusion_model_wtype) {
                 clip_on_cpu = true;
                 LOG_INFO("set clip_on_cpu to true");
             }

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ class StableDiffusionGGML {`
`343`	`343`	`if (version == VERSION_SD3_MEDIUM \|\| version == VERSION_SD3_5_MEDIUM \|\| version == VERSION_SD3_5_LARGE \|\| version == VERSION_FLUX_DEV \|\| version == VERSION_FLUX_SCHNELL) {`
`344`	`344`	`use_t5xxl = true;`
`345`	`345`	`}`
`346`		`- if (!ggml_backend_is_cpu(backend) && use_t5xxl && conditioner_wtype < GGML_TYPE_F16) {`
	`346`	`+ if (!ggml_backend_is_cpu(backend) && use_t5xxl && conditioner_wtype != diffusion_model_wtype) {`
`347`	`347`	`clip_on_cpu = true;`
`348`	`348`	`LOG_INFO("set clip_on_cpu to true");`
`349`	`349`	`}`