From 56372ef680e9ed7ad2bf9079eda9116130cf17f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E9=9B=AA=E5=B3=B0?= Date: Tue, 31 Dec 2024 19:28:36 +0800 Subject: [PATCH] fix tensor(640) error --- brushnet_nodes.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/brushnet_nodes.py b/brushnet_nodes.py index 47803d0..cdc71ab 100644 --- a/brushnet_nodes.py +++ b/brushnet_nodes.py @@ -274,11 +274,11 @@ class PowerPaint: # unload vae and CLIPs del vae del clip - for loaded_model in comfy.model_management.current_loaded_models: - if type(loaded_model.model.model) in ModelsToUnload: - comfy.model_management.current_loaded_models.remove(loaded_model) - loaded_model.model_unload() - del loaded_model + # for loaded_model in comfy.model_management.current_loaded_models: + # if type(loaded_model.model) in ModelsToUnload: + # comfy.model_management.current_loaded_models.remove(loaded_model) + # loaded_model.model_unload() + # del loaded_model # apply patch to model @@ -362,11 +362,11 @@ class BrushNet: # unload vae del vae - for loaded_model in comfy.model_management.current_loaded_models: - if type(loaded_model.model.model) in ModelsToUnload: - comfy.model_management.current_loaded_models.remove(loaded_model) - loaded_model.model_unload() - del loaded_model + # for loaded_model in comfy.model_management.current_loaded_models: + # if type(loaded_model.model) in ModelsToUnload: + # comfy.model_management.current_loaded_models.remove(loaded_model) + # loaded_model.model_unload() + # del loaded_model # prepare embeddings @@ -938,8 +938,12 @@ def add_brushnet_patch(model, brushnet, torch_dtype, conditioning_latents, is_SDXL = isinstance(model.model.model_config, comfy.supported_models.SDXL) + fp8 = model.model.model_config.optimizations.get("fp8", model.model.model_config.scaled_fp8 is not None) + operations = comfy.ops.pick_operations(model.model.model_config.unet_config.get("dtype", None), model.model.manual_cast_dtype, + fp8_optimizations=fp8, scaled_fp8=model.model.model_config.scaled_fp8) + if is_SDXL: - input_blocks = [[0, comfy.ops.disable_weight_init.Conv2d], + input_blocks = [[0, operations.Conv2d], [1, comfy.ldm.modules.diffusionmodules.openaimodel.ResBlock], [2, comfy.ldm.modules.diffusionmodules.openaimodel.ResBlock], [3, comfy.ldm.modules.diffusionmodules.openaimodel.Downsample], @@ -961,7 +965,7 @@ def add_brushnet_patch(model, brushnet, torch_dtype, conditioning_latents, [7, comfy.ldm.modules.diffusionmodules.openaimodel.ResBlock], [8, comfy.ldm.modules.diffusionmodules.openaimodel.ResBlock]] else: - input_blocks = [[0, comfy.ops.disable_weight_init.Conv2d], + input_blocks = [[0, operations.Conv2d], [1, comfy.ldm.modules.attention.SpatialTransformer], [2, comfy.ldm.modules.attention.SpatialTransformer], [3, comfy.ldm.modules.diffusionmodules.openaimodel.Downsample],