holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1316 from JeLuF/fix1312

Browse Source 
Fix #1312 - invert model A and B ratio in merge
This commit is contained in:
cmdr2 2023-05-28 17:33:26 +05:30 committed by GitHub
commit 0ebf9df207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/plugins/ui/merge.plugin.js
View File

@ -403,16 +403,19 @@
// Batch main loop // Batch main loop
for (let i = 0; i < iterations; i++) { for (let i = 0; i < iterations; i++) {
let alpha = (start + i * step) / 100 let alpha = (start + i * step) / 100
switch (document.querySelector("#merge-interpolation").value) {
case "SmoothStep": if (isTabActive(tabSettingsBatch)) {
alpha = smoothstep(alpha) switch (document.querySelector("#merge-interpolation").value) {
break case "SmoothStep":
case "SmootherStep": alpha = smoothstep(alpha)
alpha = smootherstep(alpha) break
break case "SmootherStep":
case "SmoothestStep": alpha = smootherstep(alpha)
alpha = smootheststep(alpha) break
break case "SmoothestStep":
alpha = smootheststep(alpha)
break
}
} }
addLogMessage(`merging batch job ${i + 1}/${iterations}, alpha = ${alpha.toFixed(5)}...`) addLogMessage(`merging batch job ${i + 1}/${iterations}, alpha = ${alpha.toFixed(5)}...`)
@ -420,7 +423,8 @@
request["out_path"] += "-" + alpha.toFixed(5) + "." + document.querySelector("#merge-format").value request["out_path"] += "-" + alpha.toFixed(5) + "." + document.querySelector("#merge-format").value
addLogMessage(`&nbsp;&nbsp;filename: ${request["out_path"]}`) addLogMessage(`&nbsp;&nbsp;filename: ${request["out_path"]}`)
request["ratio"] = alpha // sdkit documentation: "ratio - the ratio of the second model. 1 means only the second model will be used."
request["ratio"] = 1-alpha
let res = await fetch("/model/merge", { let res = await fetch("/model/merge", {
method: "POST", method: "POST",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },