wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-22 20:30:25 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge branch 'comfyanonymous:master' into feature/preview-latent

Browse Source
This commit is contained in:
Dr.Lt.Data 2023-06-01 09:38:08 +09:00 committed by GitHub
commit 5cc1707214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
comfy/sd.py
View File

@ -743,7 +743,7 @@ def load_controlnet(ckpt_path, model=None):
use_spatial_transformer=True, use_spatial_transformer=True,
transformer_depth=1, transformer_depth=1,
context_dim=context_dim, context_dim=context_dim,
use_checkpoint=True, use_checkpoint=False,
legacy=False, legacy=False,
use_fp16=use_fp16) use_fp16=use_fp16)
else: else:
@ -760,7 +760,7 @@ def load_controlnet(ckpt_path, model=None):
use_linear_in_transformer=True, use_linear_in_transformer=True,
transformer_depth=1, transformer_depth=1,
context_dim=context_dim, context_dim=context_dim,
use_checkpoint=True, use_checkpoint=False,
legacy=False, legacy=False,
use_fp16=use_fp16) use_fp16=use_fp16)
if pth: if pth:
@ -1045,7 +1045,7 @@ def load_checkpoint_guess_config(ckpt_path, output_vae=True, output_clip=True, o
} }
unet_config = { unet_config = {
"use_checkpoint": True, "use_checkpoint": False,
"image_size": 32, "image_size": 32,
"out_channels": 4, "out_channels": 4,
"attention_resolutions": [ "attention_resolutions": [

7
web/scripts/app.js
View File

@ -1010,6 +1010,11 @@ export class ComfyApp {
const app = this; const app = this;
// Load node definitions from the backend // Load node definitions from the backend
const defs = await api.getNodeDefs(); const defs = await api.getNodeDefs();
await this.registerNodesFromDefs(defs);
await this.#invokeExtensionsAsync("registerCustomNodes");
}
async registerNodesFromDefs(defs) {
await this.#invokeExtensionsAsync("addCustomNodeDefs", defs); await this.#invokeExtensionsAsync("addCustomNodeDefs", defs);
// Generate list of known widgets // Generate list of known widgets
@ -1082,8 +1087,6 @@ export class ComfyApp {
LiteGraph.registerNodeType(nodeId, node); LiteGraph.registerNodeType(nodeId, node);
node.category = nodeData.category; node.category = nodeData.category;
} }
await this.#invokeExtensionsAsync("registerCustomNodes");
} }
/** /**