wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-09 21:12:36 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'comfyanonymous:master' into feature/clipspace

Browse Source
This commit is contained in:
ltdrdata 2023-04-21 15:17:28 +09:00 committed by GitHub
commit a364df24cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
comfy/samplers.py
View File

@ -7,23 +7,6 @@ from comfy import model_management
from .ldm.models.diffusion.ddim import DDIMSampler from .ldm.models.diffusion.ddim import DDIMSampler
from .ldm.modules.diffusionmodules.util import make_ddim_timesteps from .ldm.modules.diffusionmodules.util import make_ddim_timesteps
class CFGDenoiser(torch.nn.Module):
def __init__(self, model):
super().__init__()
self.inner_model = model
def forward(self, x, sigma, uncond, cond, cond_scale):
if len(uncond[0]) == len(cond[0]) and x.shape[0] * x.shape[2] * x.shape[3] < (96 * 96): #TODO check memory instead
x_in = torch.cat([x] * 2)
sigma_in = torch.cat([sigma] * 2)
cond_in = torch.cat([uncond, cond])
uncond, cond = self.inner_model(x_in, sigma_in, cond=cond_in).chunk(2)
else:
cond = self.inner_model(x, sigma, cond=cond)
uncond = self.inner_model(x, sigma, cond=uncond)
return uncond + (cond - uncond) * cond_scale
#The main sampling function shared by all the samplers #The main sampling function shared by all the samplers
#Returns predicted noise #Returns predicted noise
def sampling_function(model_function, x, timestep, uncond, cond, cond_scale, cond_concat=None, model_options={}): def sampling_function(model_function, x, timestep, uncond, cond, cond_scale, cond_concat=None, model_options={}):

34
web/extensions/core/editAttention.js
View File

@ -89,24 +89,17 @@ app.registerExtension({
end = nearestEnclosure.end; end = nearestEnclosure.end;
selectedText = inputField.value.substring(start, end); selectedText = inputField.value.substring(start, end);
} else { } else {
// Select the current word, find the start and end of the word (first space before and after) // Select the current word, find the start and end of the word
const wordStart = inputField.value.substring(0, start).lastIndexOf(" ") + 1; const delimiters = " .,\\/!?%^*;:{}=-_`~()\r\n\t";
const wordEnd = inputField.value.substring(end).indexOf(" ");
// If there is no space after the word, select to the end of the string while (!delimiters.includes(inputField.value[start - 1]) && start > 0) {
if (wordEnd === -1) { start--;
end = inputField.value.length; }
} else {
end += wordEnd; while (!delimiters.includes(inputField.value[end]) && end < inputField.value.length) {
end++;
} }
start = wordStart;
// Remove all punctuation at the end and beginning of the word
while (inputField.value[start].match(/[.,\/#!$%\^&\*;:{}=\-_`~()]/)) {
start++;
}
while (inputField.value[end - 1].match(/[.,\/#!$%\^&\*;:{}=\-_`~()]/)) {
end--;
}
selectedText = inputField.value.substring(start, end); selectedText = inputField.value.substring(start, end);
if (!selectedText) return; if (!selectedText) return;
} }
@ -135,8 +128,13 @@ app.registerExtension({
// Increment the weight // Increment the weight
const weightDelta = event.key === "ArrowUp" ? delta : -delta; const weightDelta = event.key === "ArrowUp" ? delta : -delta;
const updatedText = selectedText.replace(/(.*:)(\d+(\.\d+)?)(.*)/, (match, prefix, weight, _, suffix) => { const updatedText = selectedText.replace(/\((.*):(\d+(?:\.\d+)?)\)/, (match, text, weight) => {
return prefix + incrementWeight(weight, weightDelta) + suffix; weight = incrementWeight(weight, weightDelta);
if (weight == 1) {
return text;
} else {
return `(${text}:${weight})`;
}
}); });
inputField.setRangeText(updatedText, start, end, "select"); inputField.setRangeText(updatedText, start, end, "select");