update to latest stable-diffusion.cpp #2
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -248,7 +248,7 @@ namespace | |
|
|
||
| return ret; | ||
| } | ||
|
|
||
| class NodeStableDiffusionCpp : public Napi::Addon<NodeStableDiffusionCpp> | ||
| { | ||
| public: | ||
|
|
@@ -268,6 +268,8 @@ namespace | |
| Napi::PropertyDescriptor::Value("DPMPP2M", Napi::Number::New(env, DPMPP2M)), | ||
| Napi::PropertyDescriptor::Value("DPMPP2Mv2", Napi::Number::New(env, DPMPP2Mv2)), | ||
| Napi::PropertyDescriptor::Value("LCM", Napi::Number::New(env, LCM)), | ||
| Napi::PropertyDescriptor::Value("IPNDM", Napi::Number::New(env, IPNDM)), | ||
| Napi::PropertyDescriptor::Value("IPNDM_V", Napi::Number::New(env, IPNDM_V)), | ||
| }); | ||
| sampleMethodEnum.Freeze(); | ||
|
|
||
|
|
@@ -278,6 +280,7 @@ namespace | |
| Napi::PropertyDescriptor::Value("Discrete", Napi::Number::New(env, DISCRETE)), | ||
| Napi::PropertyDescriptor::Value("Karras", Napi::Number::New(env, KARRAS)), | ||
| Napi::PropertyDescriptor::Value("AYS", Napi::Number::New(env, AYS)), | ||
| Napi::PropertyDescriptor::Value("GITS", Napi::Number::New(env, GITS)), | ||
| }); | ||
| scheduleEnum.Freeze(); | ||
|
|
||
|
|
@@ -336,7 +339,11 @@ namespace | |
| { | ||
| Napi::Value tmp; | ||
| const auto params = info[0].ToObject(); | ||
| const auto model = (tmp = params.Get("model"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
|
Owner
There was a problem hiding this comment. Is it valid to pass a "" model to new_sd_ctx? I assumed no, which was why this was previously not an optional param but maybe I'm wrong?
Contributor
Author
There was a problem hiding this comment. It became optional in the flux PR here https://github.com/leejet/stable-diffusion.cpp/pull/356/files#diff-a8e875e8f7684a2f9e35212d88ee9574001952eb2c049385e73d5e24fd6e2a83L172-R205 - for flux inference need to set the |
||
| const auto clipL = (tmp = params.Get("clipL"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
| const auto clipG = (tmp = params.Get("clipG"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
| const auto t5xxl = (tmp = params.Get("t5xxl"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
| const auto diffusionModel = (tmp = params.Get("diffusionModel"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
| const auto vae = (tmp = params.Get("vae"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
| const auto taesd = (tmp = params.Get("taesd"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
| const auto controlNet = (tmp = params.Get("controlNet"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
|
|
@@ -375,9 +382,34 @@ namespace | |
|
|
||
| return queueStableDiffusionWorker(info.Env(), cppContextData, [=](CPPContextData& ctx) | ||
| { | ||
| ctx.sdCtx = { | ||
| new_sd_ctx( | ||
| model.c_str(), | ||
| clipL.c_str(), | ||
| clipG.c_str(), | ||
| t5xxl.c_str(), | ||
| diffusionModel.c_str(), | ||
| vae.c_str(), | ||
| taesd.c_str(), | ||
| controlNet.c_str(), | ||
| loraDir.c_str(), | ||
| embedDir.c_str(), | ||
| stackedIdEmbedDir.c_str(), | ||
| vaeDecodeOnly, | ||
| vaeTiling, | ||
| freeParamsImmediately, | ||
| numThreads, | ||
| weightType, | ||
| cudaRng ? CUDA_RNG : STD_DEFAULT_RNG, | ||
| schedule, | ||
| keepClipOnCpu, | ||
| keepControlNetOnCpu, | ||
| keepVaeOnCpu | ||
| ), | ||
| [](sd_ctx_t* c) { | ||
| if (c) free_sd_ctx(c); | ||
| } | ||
| }; | ||
|
|
||
| if (!ctx.sdCtx) | ||
| throw std::runtime_error("Context creation failed"); | ||
|
|
@@ -427,12 +459,32 @@ namespace | |
| const auto styleRatio = (tmp = params.Get("styleRatio"), tmp.IsUndefined() ? 20.0f : tmp.ToNumber().FloatValue()); | ||
| const auto normalizeInput = (tmp = params.Get("normalizeInput"), tmp.IsUndefined() ? false : tmp.ToBoolean().Value()); | ||
| const auto inputIdImagesPath = (tmp = params.Get("inputIdImagesPath"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
| const auto guidance = (tmp = params.Get("guidance"), tmp.IsUndefined() ? 0.0f : tmp.ToNumber().FloatValue()); | ||
|
|
||
| if (sampleMethod >= N_SAMPLE_METHODS) | ||
| throw Napi::Error::New(info.Env(), "Invalid sampleMethod"); | ||
|
|
||
| return queueStableDiffusionWorker(info.Env(), cppContextData, [=, sdCtx = cppContextData->sdCtx, controlCond = std::move(controlCond)](CPPContextData& ctx) | ||
| { | ||
| return SdImageList(txt2img( | ||
| sdCtx.get(), | ||
| prompt.c_str(), | ||
| negativePrompt.c_str(), | ||
| clipSkip, | ||
| cfgScale, | ||
| guidance, | ||
| width, | ||
| height, | ||
| sampleMethod, | ||
| sampleSteps, | ||
| seed, | ||
| batchCount, | ||
| controlCond.get(), | ||
| controlStrength, | ||
| styleRatio, | ||
| normalizeInput, | ||
| inputIdImagesPath.c_str() | ||
| ), batchCount); | ||
| }, | ||
| [batchCount](Napi::Env env, SdImageList&& images) | ||
| { | ||
|
|
@@ -468,12 +520,33 @@ namespace | |
| const auto styleRatio = (tmp = params.Get("styleRatio"), tmp.IsUndefined() ? 20.0f : tmp.ToNumber().FloatValue()); | ||
| const auto normalizeInput = (tmp = params.Get("normalizeInput"), tmp.IsUndefined() ? false : tmp.ToBoolean().Value()); | ||
| const auto inputIdImagesPath = (tmp = params.Get("inputIdImagesPath"), tmp.IsUndefined() ? "" : tmp.ToString().Utf8Value()); | ||
| const auto guidance = (tmp = params.Get("guidance"), tmp.IsUndefined() ? 0.0f : tmp.ToNumber().FloatValue()); | ||
| if (sampleMethod >= N_SAMPLE_METHODS) | ||
| throw Napi::Error::New(info.Env(), "Invalid sampleMethod"); | ||
|
|
||
| return queueStableDiffusionWorker(info.Env(), cppContextData, [=, sdCtx = cppContextData->sdCtx, initImage = std::move(initImage), controlCond = std::move(controlCond)](CPPContextData& ctx) | ||
| { | ||
| return SdImageList(img2img( | ||
| sdCtx.get(), | ||
| *initImage, | ||
| prompt.c_str(), | ||
| negativePrompt.c_str(), | ||
| clipSkip, | ||
| cfgScale, | ||
| guidance, | ||
| width, | ||
| height, | ||
| sampleMethod, | ||
| sampleSteps, | ||
| strength, | ||
| seed, | ||
| batchCount, | ||
| controlCond.get(), | ||
| controlStrength, | ||
| styleRatio, | ||
| normalizeInput, | ||
| inputIdImagesPath.c_str() | ||
| ), batchCount); | ||
| }, | ||
| [batchCount](Napi::Env env, SdImageList&& images) | ||
| { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason to not try find_package(Vulkan) first and only do this if !Vulkan_FOUND or does find_package find the wrong thing? I know I had some weird issues on GH actions runners with CUDA.