refactor(tx): adjust log

thxCode · thxCode · commit ac269e78ee18 · 2024-11-28T19:49:18.000+08:00
Signed-off-by: thxCode &lt;thxcode0824@gmail.com&gt;
diff --git a/model.cpp b/model.cpp
@@ -1564,20 +1564,7 @@ SDVersion ModelLoader::get_sd_version() {
 }
 
 ggml_type ModelLoader::get_sd_wtype() {
-    for (auto& tensor_storage : tensor_storages) {
-        if (is_unused_tensor(tensor_storage.name)) {
-            continue;
-        }
-
-        if (ggml_is_quantized(tensor_storage.type)) {
-            return tensor_storage.type;
-        }
-
-        if (tensor_should_be_converted(tensor_storage, GGML_TYPE_Q4_K)) {
-            return tensor_storage.type;
-        }
-    }
-    return GGML_TYPE_COUNT;
+    return get_diffusion_model_wtype();
 }
 
 ggml_type ModelLoader::get_conditioner_wtype() {
diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp
@@ -30,12 +30,12 @@ const char* model_version_to_str[] = {
     "SDXL",
     "SDXL Refiner",
     "SVD",
-    "SD3 2B",
+    "SD3 Medium",
     "Flux Dev",
     "Flux Schnell",
-    "SD3.5 8B",
-    "SD3.5 2B",
-    "Flux Lite 8B",
+    "SD3.5 Large",
+    "SD3.5 Medium",
+    "Flux Lite",
 };
 
 const char* sampling_methods_str[] = {
@@ -338,13 +338,6 @@ class StableDiffusionGGML {
 
         if (version == VERSION_SDXL || version == VERSION_SDXL_REFINER) {
             scale_factor = 0.13025f;
-            if (vae_path.size() == 0 && taesd_path.size() == 0) {
-                LOG_WARN(
-                    "!!!It looks like you are using SDXL model. "
-                    "If you find that the generated images are completely black, "
-                    "try specifying SDXL VAE FP16 Fix with the --vae parameter. "
-                    "You can find it here: https://huggingface.co/madebyollin/sdxl-vae-fp16-fix/blob/main/sdxl_vae.safetensors");
-            }
         } else if (sd_version_is_sd3(version)) {
             scale_factor = 1.5305f;
         } else if (sd_version_is_flux(version)) {
@@ -376,7 +369,7 @@ class StableDiffusionGGML {
             if (sd_version_is_dit(version)) {
                 use_t5xxl = true;
             }
-            if (!ggml_backend_is_cpu(backend) && use_t5xxl && conditioner_wtype != GGML_TYPE_F32) {
+            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");
             }
