mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-16 22:58:19 +08:00
Merge branch 'master' of https://github.com/xmarre/ComfyUI
This commit is contained in:
commit
77bc7bdd6b
@ -11,6 +11,7 @@ from .causal_conv3d import CausalConv3d
|
|||||||
from .pixel_norm import PixelNorm
|
from .pixel_norm import PixelNorm
|
||||||
from ..model import PixArtAlphaCombinedTimestepSizeEmbeddings
|
from ..model import PixArtAlphaCombinedTimestepSizeEmbeddings
|
||||||
import comfy.ops
|
import comfy.ops
|
||||||
|
import comfy.model_management
|
||||||
from comfy.ldm.modules.diffusionmodules.model import torch_cat_if_needed
|
from comfy.ldm.modules.diffusionmodules.model import torch_cat_if_needed
|
||||||
|
|
||||||
ops = comfy.ops.disable_weight_init
|
ops = comfy.ops.disable_weight_init
|
||||||
@ -536,7 +537,7 @@ class Decoder(nn.Module):
|
|||||||
mark_conv3d_ended(self.conv_out)
|
mark_conv3d_ended(self.conv_out)
|
||||||
sample = self.conv_out(sample, causal=self.causal)
|
sample = self.conv_out(sample, causal=self.causal)
|
||||||
if sample is not None and sample.shape[2] > 0:
|
if sample is not None and sample.shape[2] > 0:
|
||||||
output.append(sample)
|
output.append(sample.to(comfy.model_management.intermediate_device()))
|
||||||
return
|
return
|
||||||
|
|
||||||
up_block = self.up_blocks[idx]
|
up_block = self.up_blocks[idx]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user