xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-09-06 14:17:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge deb49403c61b3f8655f184d0467a8a996360b584 into d6b977b2e680e98ad18a37ee13783da4f30e15f4

Browse Source
This commit is contained in:
Anghammar 2025-09-12 19:31:04 +08:00 committed by GitHub
commit 46485d8b89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
comfy/sd.py
View File

@ -776,6 +776,26 @@ class VAE:
except: except:
return None return None
class ForcedTiledVAE(VAE):
def __init__(self, tile_size, overlap, temporal_size=64, temporal_overlap=8, sd=None, device=None, config=None, dtype=None, metadata=None):
super().__init__(sd, device, config, dtype, metadata)
self.tile_size = tile_size
self.overlap = overlap
self.temporal_size = temporal_size
self.temporal_overlap = temporal_overlap
@classmethod
def cast(cls, vae: VAE, tile_size, overlap, temporal_size=64, temporal_overlap=8):
vae.__class__ = cls
vae.tile_size = tile_size
vae.overlap = overlap
vae.temporal_size = temporal_size
vae.temporal_overlap = temporal_overlap
return vae
def encode(self, pixel_samples):
return super().encode_tiled(pixel_samples, self.tile_size, self.tile_size, self.overlap, self.temporal_size, self.temporal_overlap)
class StyleModel: class StyleModel:
def __init__(self, model, device="cpu"): def __init__(self, model, device="cpu"):
self.model = model self.model = model

20
nodes.py
View File

@ -361,6 +361,24 @@ class VAEEncodeTiled:
t = vae.encode_tiled(pixels[:,:,:,:3], tile_x=tile_size, tile_y=tile_size, overlap=overlap, tile_t=temporal_size, overlap_t=temporal_overlap) t = vae.encode_tiled(pixels[:,:,:,:3], tile_x=tile_size, tile_y=tile_size, overlap=overlap, tile_t=temporal_size, overlap_t=temporal_overlap)
return ({"samples": t}, ) return ({"samples": t}, )
class ForceTiledVAEEncode:
@classmethod
def INPUT_TYPES(s):
return {"required": {"vae": ("VAE", ),
"tile_size": ("INT", {"default": 256, "min": 64, "max": 4096, "step": 32}),
"overlap": ("INT", {"default": 64, "min": 0, "max": 4096, "step": 32}),
"temporal_size": ("INT", {"default": 64, "min": 8, "max": 4096, "step": 4, "tooltip": "Only used for video VAEs: Amount of frames to encode at a time."}),
"temporal_overlap": ("INT", {"default": 8, "min": 4, "max": 4096, "step": 4, "tooltip": "Only used for video VAEs: Amount of frames to overlap."}),
}}
RETURN_TYPES = ("VAE",)
FUNCTION = "cast"
CATEGORY = "_for_testing"
def cast(self, vae, tile_size, overlap, temporal_size=64, temporal_overlap=8):
tiled_vae = comfy.sd.ForcedTiledVAE.cast(vae, tile_size, overlap, temporal_size, temporal_overlap)
return (tiled_vae, )
class VAEEncodeForInpaint: class VAEEncodeForInpaint:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
@ -1993,6 +2011,7 @@ NODE_CLASS_MAPPINGS = {
"CLIPVisionLoader": CLIPVisionLoader, "CLIPVisionLoader": CLIPVisionLoader,
"VAEDecodeTiled": VAEDecodeTiled, "VAEDecodeTiled": VAEDecodeTiled,
"VAEEncodeTiled": VAEEncodeTiled, "VAEEncodeTiled": VAEEncodeTiled,
"ForceTiledVAEEncode": ForceTiledVAEEncode,
"unCLIPCheckpointLoader": unCLIPCheckpointLoader, "unCLIPCheckpointLoader": unCLIPCheckpointLoader,
"GLIGENLoader": GLIGENLoader, "GLIGENLoader": GLIGENLoader,
"GLIGENTextBoxApply": GLIGENTextBoxApply, "GLIGENTextBoxApply": GLIGENTextBoxApply,
@ -2076,6 +2095,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
# _for_testing # _for_testing
"VAEDecodeTiled": "VAE Decode (Tiled)", "VAEDecodeTiled": "VAE Decode (Tiled)",
"VAEEncodeTiled": "VAE Encode (Tiled)", "VAEEncodeTiled": "VAE Encode (Tiled)",
"ForceTiledVAEEncode": "Force tiled VAE Encode",
} }
EXTENSION_WEB_DIRS = {} EXTENSION_WEB_DIRS = {}