From e466ce65e2b25d3567567cb145018532e4e85258 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Sun, 16 Mar 2025 20:12:43 +0800 Subject: [PATCH] updated sd metadata --- otherarch/sdcpp/sdtype_adapter.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/otherarch/sdcpp/sdtype_adapter.cpp b/otherarch/sdcpp/sdtype_adapter.cpp index 0d1348a69..777070a1c 100644 --- a/otherarch/sdcpp/sdtype_adapter.cpp +++ b/otherarch/sdcpp/sdtype_adapter.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include "model_adapter.h" @@ -116,6 +117,7 @@ static uint8_t * input_image_buffer = NULL; static std::string sdplatformenv, sddeviceenv, sdvulkandeviceenv; static bool notiling = false; static bool sd_is_quiet = false; +static std::string sdmodelfilename = ""; bool sdtype_load_model(const sd_load_model_inputs inputs) { sd_is_quiet = inputs.quiet; @@ -129,6 +131,7 @@ bool sdtype_load_model(const sd_load_model_inputs inputs) { std::string clipg_filename = inputs.clipg_filename; notiling = inputs.notile; printf("\nImageGen Init - Load Model: %s\n",inputs.model_filename); + if(lorafilename!="") { printf("With LoRA: %s at %f power\n",lorafilename.c_str(),inputs.lora_multiplier); @@ -253,6 +256,9 @@ bool sdtype_load_model(const sd_load_model_inputs inputs) { return false; } + std::filesystem::path mpath(inputs.model_filename); + sdmodelfilename = mpath.filename().string(); + if(lorafilename!="" && inputs.lora_multiplier>0) { printf("\nApply LoRA...\n"); @@ -279,14 +285,16 @@ std::string clean_input_prompt(const std::string& input) { } static std::string get_image_params(const SDParams& params) { - std::string parameter_string = "Prompt: " + params.prompt + ", "; - parameter_string += "NegativePrompt: " + params.negative_prompt + ", "; - parameter_string += "Steps: " + std::to_string(params.sample_steps) + ", "; - parameter_string += "CFGScale: " + std::to_string(params.cfg_scale) + ", "; - parameter_string += "Guidance: " + std::to_string(params.guidance) + ", "; - parameter_string += "Seed: " + std::to_string(params.seed) + ", "; - parameter_string += "Size: " + std::to_string(params.width) + "x" + std::to_string(params.height) + ", "; - parameter_string += "Sampler: " + std::to_string((int)sd_params->sample_method) + ", "; + std::string parameter_string = ""; + parameter_string += "Prompt: " + params.prompt + " | "; + parameter_string += "NegativePrompt: " + params.negative_prompt + " | "; + parameter_string += "Steps: " + std::to_string(params.sample_steps) + " | "; + parameter_string += "CFGScale: " + std::to_string(params.cfg_scale) + " | "; + parameter_string += "Guidance: " + std::to_string(params.guidance) + " | "; + parameter_string += "Seed: " + std::to_string(params.seed) + " | "; + parameter_string += "Size: " + std::to_string(params.width) + "x" + std::to_string(params.height) + " | "; + parameter_string += "Sampler: " + std::to_string((int)sd_params->sample_method) + " | "; + parameter_string += "Model: " + sdmodelfilename + " | "; parameter_string += "Version: KoboldCpp"; return parameter_string; }