From aba73f789bdc193cfe96872a95e16d2013eb9f06 Mon Sep 17 00:00:00 2001 From: yolain Date: Mon, 8 Jan 2024 15:56:13 +0800 Subject: [PATCH] remove:AutoDownScaleUnet (Because is not a good modification) --- README.en.md | 1 - README.md | 2 +- py/easyNodes.py | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.en.md b/README.en.md index 43bf117..d0c0fba 100644 --- a/README.en.md +++ b/README.en.md @@ -32,7 +32,6 @@ After installing the node package, the UI interface will be automatically switch **2024-01-08** - `easy XYInputs ModelMergeBlocks` Values can be imported from CSV files -- `easy kSamplerFull` and other related samplers have added the judgment of the model context_dim, and if it exceeds a certain percentage, the model Unet will be automatically contracted with the default parameters (if the relevant node of the shrinking Unet is connected, this operation will not be performed) - Fixed `easy pipeToBasicPipe` Bug - Removed `easy imageRemBg` diff --git a/README.md b/README.md index ac8e4ae..2e98285 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,8 @@ **2024-01-08** +- 修改 `easy fullLoader` 和 `easy a1111Loader` 中的 **a1111_prompt_style** 默认值为 False - `easy XYInputs ModelMergeBlocks` 支持csv文件导入数值 -- `easy kSamplerFull` 等相关采样器 增加了对模型context_dim的判断，若超出一定比例将使用默认参数自动收缩模型Unet (若连接了收缩Unet的相关节点将不执行此操作) - 修复 `easy pipeToBasicPipe` 报错 - 移除了 `easy imageRemBg` (很多包中都有移除背景的节点，由于比较占用ComfyUI启动加载时间，这次更新中注释掉了其相关代码) diff --git a/py/easyNodes.py b/py/easyNodes.py index 8cb2409..74fcfe4 100644 --- a/py/easyNodes.py +++ b/py/easyNodes.py @@ -1570,7 +1570,7 @@ class fullLoader: @classmethod def INPUT_TYPES(cls): resolution_strings = [f"{width} x {height}" for width, height in BASE_RESOLUTIONS] - a1111_prompt_style_default = True if "smZ CLIPTextEncode" in ALL_NODE_CLASS_MAPPINGS else False + a1111_prompt_style_default = False return {"required": { "ckpt_name": (folder_paths.get_filename_list("checkpoints"),), @@ -1770,7 +1770,7 @@ class a1111Loader: @classmethod def INPUT_TYPES(cls): resolution_strings = [f"{width} x {height}" for width, height in BASE_RESOLUTIONS] - a1111_prompt_style_default = True if "smZ CLIPTextEncode" in ALL_NODE_CLASS_MAPPINGS else False + a1111_prompt_style_default = False checkpoints = folder_paths.get_filename_list("checkpoints") loras = ["None"] + folder_paths.get_filename_list("loras") return {"required": { @@ -2741,7 +2741,7 @@ class samplerFull: FUNCTION = "run" CATEGORY = "EasyUse/Sampler" - def run(self, pipe, steps, cfg, sampler_name, scheduler, denoise, image_output, link_id, save_prefix, seed_num=None, model=None, positive=None, negative=None, latent=None, vae=None, clip=None, xyPlot=None, tile_size=None, prompt=None, extra_pnginfo=None, my_unique_id=None, force_full_denoise=False, disable_noise=False): + def run(self, pipe, steps, cfg, sampler_name, scheduler, denoise, image_output, link_id, save_prefix, seed_num=None, model=None, positive=None, negative=None, latent=None, vae=None, clip=None, xyPlot=None, tile_size=None, prompt=None, extra_pnginfo=None, my_unique_id=None, force_full_denoise=False, disable_noise=False, auto_downscale=False): # Clean loaded_objects easyCache.update_loaded_objects(prompt) @@ -2822,8 +2822,8 @@ class samplerFull: preview_latent, force_full_denoise=force_full_denoise, disable_noise=disable_noise): # Downscale Model Unet - if samp_model is not None: - samp_model = downscale_model_unet(samp_model) + # if samp_model is not None and auto_downscale: + # samp_model = downscale_model_unet(samp_model) # 推理初始时间 start_time = int(time.time() * 1000) # 开始推理