From f0d3442f1683d3dbf55a20220fc9123c6562d61c Mon Sep 17 00:00:00 2001 From: Johnson yue <249779451@qq.com> Date: Thu, 23 May 2024 11:03:27 +0800 Subject: [PATCH] merge master[24.05.23] and initial local repo --- .gitignore | 5 ++- .vscode/launch.json | 24 ++++++++++++ comfy/cli_args.py | 2 +- comfy/model_patcher.py | 7 +++- comfy/utils.py | 7 ++++ extra_model_paths.yaml.example | 42 --------------------- input/example.png | Bin 8589 -> 0 bytes requirements.txt | 4 +- styles/n-styles.csv | 2 + temp | 1 + test_notebook.ipynb | 65 +++++++++++++++++++++++++++++++++ test_xformers.py | 16 ++++++++ yq_run.sh | 3 ++ 13 files changed, 130 insertions(+), 48 deletions(-) create mode 100644 .vscode/launch.json delete mode 100644 extra_model_paths.yaml.example delete mode 100644 input/example.png create mode 100644 styles/n-styles.csv create mode 120000 temp create mode 100644 test_notebook.ipynb create mode 100644 test_xformers.py create mode 100644 yq_run.sh diff --git a/.gitignore b/.gitignore index 9f0389241..0611cf0d0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,7 @@ venv/ !/web/extensions/logging.js.example !/web/extensions/core/ /tests-ui/data/object_info.json -/user/ \ No newline at end of file +/user/ +my_workflows/* +*.log +login/* \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..4904f1f92 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Current File", + "type": "debugpy", + "request": "launch", + "program": "${file}", + "console": "integratedTerminal" + }, + { + "name": "launch", + "type": "debugpy", + "request": "launch", + "program": "main.py", + "console": "integratedTerminal", + "args": ["--cuda-device", "3", "--listen", "0.0.0.0", "--port", "38188"], + "env": {"http_proxy":"http://127.0.0.1:7890", "https_proxy":"http://127.0.0.1:7890"} + } + ] +} \ No newline at end of file diff --git a/comfy/cli_args.py b/comfy/cli_args.py index b8ac9bc69..4b49042f3 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -33,7 +33,7 @@ class EnumAction(argparse.Action): parser = argparse.ArgumentParser() -parser.add_argument("--listen", type=str, default="127.0.0.1", metavar="IP", nargs="?", const="0.0.0.0", help="Specify the IP address to listen on (default: 127.0.0.1). If --listen is provided without an argument, it defaults to 0.0.0.0. (listens on all)") +parser.add_argument("--listen", type=str, default="0.0.0.0", metavar="IP", nargs="?", const="0.0.0.0", help="Specify the IP address to listen on (default: 127.0.0.1). If --listen is provided without an argument, it defaults to 0.0.0.0. (listens on all)") parser.add_argument("--port", type=int, default=8188, help="Set the listen port.") parser.add_argument("--tls-keyfile", type=str, help="Path to TLS (SSL) key file. Enables TLS, makes app accessible at https://... requires --tls-certfile to function") parser.add_argument("--tls-certfile", type=str, help="Path to TLS (SSL) certificate file. Enables TLS, makes app accessible at https://... requires --tls-keyfile to function") diff --git a/comfy/model_patcher.py b/comfy/model_patcher.py index c397ee51c..e79a2903e 100644 --- a/comfy/model_patcher.py +++ b/comfy/model_patcher.py @@ -256,9 +256,11 @@ class ModelPatcher: def patch_model(self, device_to=None, patch_weights=True): for k in self.object_patches: - old = comfy.utils.set_attr(self.model, k, self.object_patches[k]) + # old = comfy.utils.set_attr(self.model, k, self.object_patches[k]) + old = comfy.utils.get_attr(self.model, k) # ref :https://github.com/lllyasviel/stable-diffusion-webui-forge/commit/e48533bdcd08118c5cd7e2c1de14c91c3b7fc8ec#diff-7c5f4df48e8675674db0152893d57c9df52fd048df14e82d9f9c08154265e368 if k not in self.object_patches_backup: self.object_patches_backup[k] = old + comfy.utils.set_attr_raw(self.model, k, self.object_patches[k]) # ref :https://github.com/lllyasviel/stable-diffusion-webui-forge/commit/e48533bdcd08118c5cd7e2c1de14c91c3b7fc8ec#diff-7c5f4df48e8675674db0152893d57c9df52fd048df14e82d9f9c08154265e368 if patch_weights: model_sd = self.model_state_dict() @@ -494,6 +496,7 @@ class ModelPatcher: keys = list(self.object_patches_backup.keys()) for k in keys: - comfy.utils.set_attr(self.model, k, self.object_patches_backup[k]) + # comfy.utils.set_attr(self.model, k, self.object_patches_backup[k]) + comfy.utils.set_attr_raw(self.model, k, self.object_patches_backup[k]) self.object_patches_backup.clear() diff --git a/comfy/utils.py b/comfy/utils.py index ab47b8f28..51b66cf80 100644 --- a/comfy/utils.py +++ b/comfy/utils.py @@ -298,6 +298,13 @@ def set_attr(obj, attr, value): setattr(obj, attrs[-1], value) return prev +# ref: https://github.com/lllyasviel/stable-diffusion-webui-forge/commit/e48533bdcd08118c5cd7e2c1de14c91c3b7fc8ec#diff-7c5f4df48e8675674db0152893d57c9df52fd048df14e82d9f9c08154265e368 +def set_attr_raw(obj, attr, value): + attrs = attr.split(".") + for name in attrs[:-1]: + obj = getattr(obj, name) + setattr(obj, attrs[-1], value) + def set_attr_param(obj, attr, value): return set_attr(obj, attr, torch.nn.Parameter(value, requires_grad=False)) diff --git a/extra_model_paths.yaml.example b/extra_model_paths.yaml.example deleted file mode 100644 index 846d04dbe..000000000 --- a/extra_model_paths.yaml.example +++ /dev/null @@ -1,42 +0,0 @@ -#Rename this to extra_model_paths.yaml and ComfyUI will load it - - -#config for a1111 ui -#all you have to do is change the base_path to where yours is installed -a111: - base_path: path/to/stable-diffusion-webui/ - - checkpoints: models/Stable-diffusion - configs: models/Stable-diffusion - vae: models/VAE - loras: | - models/Lora - models/LyCORIS - upscale_models: | - models/ESRGAN - models/RealESRGAN - models/SwinIR - embeddings: embeddings - hypernetworks: models/hypernetworks - controlnet: models/ControlNet - -#config for comfyui -#your base path should be either an existing comfy install or a central folder where you store all of your models, loras, etc. - -#comfyui: -# base_path: path/to/comfyui/ -# checkpoints: models/checkpoints/ -# clip: models/clip/ -# clip_vision: models/clip_vision/ -# configs: models/configs/ -# controlnet: models/controlnet/ -# embeddings: models/embeddings/ -# loras: models/loras/ -# upscale_models: models/upscale_models/ -# vae: models/vae/ - -#other_ui: -# base_path: path/to/ui -# checkpoints: models/checkpoints -# gligen: models/gligen -# custom_nodes: path/custom_nodes diff --git a/input/example.png b/input/example.png deleted file mode 100644 index 7b7f3c9cbbe6d8750c4a9eaf65d6ae4d2f108f79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8589 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.25.1 safetensors>=0.3.0 diff --git a/styles/n-styles.csv b/styles/n-styles.csv new file mode 100644 index 000000000..b4a60a8a9 --- /dev/null +++ b/styles/n-styles.csv @@ -0,0 +1,2 @@ +name,prompt,negative_prompt +NAI,"masterpiece, best quality, masterpiece, asuka langley sitting cross legged on a chair","lowres, bad anatomy, bad hands" diff --git a/temp b/temp new file mode 120000 index 000000000..738a260f2 --- /dev/null +++ b/temp @@ -0,0 +1 @@ +/data/yue/SD_UIs/ComfyUI_Temp \ No newline at end of file diff --git a/test_notebook.ipynb b/test_notebook.ipynb new file mode 100644 index 000000000..5f07a574b --- /dev/null +++ b/test_notebook.ipynb @@ -0,0 +1,65 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [], + "source": [ + "names = [{'content': 'SUPIR/SUPIR-v0F_fp16.safetensors', 'image': None}, {'content': 'SUPIR/SUPIR-v0Q_fp16.safetensors', 'image': None}, {'content': 'TripoSR.ckpt', 'image': None}, {'content': 'sdXL/9527DetailRealistic_v40Lighting4S.safetensors', 'image': 'checkpoints/sdXL/9527DetailRealistic_v40Lighting4S.png'}, {'content': 'sdXL/albedobaseXL_v21.safetensors', 'image': 'checkpoints/sdXL/albedobaseXL_v21.png'}, {'content': 'sdXL/dreamshaperXL_v21TurboDPMSDE.safetensors', 'image': 'checkpoints/sdXL/dreamshaperXL_v21TurboDPMSDE.png'}, {'content': 'sdXL/enjoyXLSuperRealistic_v20.safetensors', 'image': 'checkpoints/sdXL/enjoyXLSuperRealistic_v20.png'}, {'content': 'sdXL/juggernautXL_v9Rdphoto2Lightning.safetensors', 'image': None}, {'content': 'sdXL/mklanRealistic_v220realistic.safetensors', 'image': 'checkpoints/sdXL/mklanRealistic_v220realistic.png'}, {'content': 'sdXL/platypusPhotorealism_v3Lightning.safetensors', 'image': 'checkpoints/sdXL/platypusPhotorealism_v3Lightning.jpeg'}, {'content': 'sdXL/realvisxlV40_v40LightningBakedvae.safetensors', 'image': 'checkpoints/sdXL/realvisxlV40_v40LightningBakedvae.jpeg'}, {'content': 'sdXL/sdXL_v10.safetensors', 'image': None}, {'content': 'sdXL/sdXL_v10Refiner.safetensors', 'image': None}, {'content': 'sdXL/sdxl10ArienmixxlAsian_v45Pruned.safetensors', 'image': 'checkpoints/sdXL/sdxl10ArienmixxlAsian_v45Pruned.png'}, {'content': 'sdXL/二次元/MR_3DQ/MR 3DQ _SDXL V0.2.safetensors', 'image': 'checkpoints/sdXL/二次元/MR_3DQ/MR 3DQ _SDXL V0.2.png'}, {'content': 'sd_15/AWPortraitWW_Lite_1.0.safetensors', 'image': 'checkpoints/sd_15/AWPortraitWW_Lite_1.0.jpg'}, {'content': 'sd_15/Chilloutmix-Ni-pruned-fp16-fix.safetensors', 'image': 'checkpoints/sd_15/Chilloutmix-Ni-pruned-fp16-fix.jpeg'}, {'content': 'sd_15/XXMixUnreal_v1.0.safetensors', 'image': 'checkpoints/sd_15/XXMixUnreal_v1.0.png'}, {'content': 'sd_15/chilloutmix-Ni.safetensors', 'image': 'checkpoints/sd_15/chilloutmix-Ni.png'}, {'content': 'sd_15/majicmixRealistic_v7-inpainting.safetensors', 'image': None}, {'content': 'sd_15/majicmixRealistic_v7.safetensors', 'image': 'checkpoints/sd_15/majicmixRealistic_v7.png'}, {'content': 'sd_15/realisticVisionV60B1_v60B1VAE.safetensors', 'image': 'checkpoints/sd_15/realisticVisionV60B1_v60B1VAE.jpeg'}, {'content': 'sd_15/v1-5-pruned-emaonly.safetensors', 'image': None}, {'content': 'sd_15/v1-5-pruned.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/Realistic_Vision_V4.0_fp16-no-ema.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/Realistic_Vision_V5.1_fp16-no-ema.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/blazingDrive_V08c.safetensors', 'image': 'checkpoints/sd_15_TextEffect/blazingDrive_V08c.jpeg'}, {'content': 'sd_15_TextEffect/dreamlike-anime-1.0.safetensors', 'image': 'checkpoints/sd_15_TextEffect/dreamlike-anime-1.0.jpg'}, {'content': 'sd_15_TextEffect/majicmixRealistic_betterV2V25.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/majicmixRealistic_v6.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/revAnimated_v122EOL.safetensors', 'image': None}]" + ] + }, + { + "cell_type": "code", + "execution_count": 7, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[{'content': 'sd_15/AWPortraitWW_Lite_1.0.safetensors', 'image': 'checkpoints/sd_15/AWPortraitWW_Lite_1.0.jpg'}, {'content': 'sd_15/Chilloutmix-Ni-pruned-fp16-fix.safetensors', 'image': 'checkpoints/sd_15/Chilloutmix-Ni-pruned-fp16-fix.jpeg'}, {'content': 'sd_15/chilloutmix-Ni.safetensors', 'image': 'checkpoints/sd_15/chilloutmix-Ni.png'}, {'content': 'sd_15/majicmixRealistic_v7-inpainting.safetensors', 'image': None}, {'content': 'sd_15/majicmixRealistic_v7.safetensors', 'image': 'checkpoints/sd_15/majicmixRealistic_v7.png'}, {'content': 'sd_15/realisticVisionV60B1_v60B1VAE.safetensors', 'image': 'checkpoints/sd_15/realisticVisionV60B1_v60B1VAE.jpeg'}, {'content': 'sd_15/v1-5-pruned-emaonly.safetensors', 'image': None}, {'content': 'sd_15/v1-5-pruned.safetensors', 'image': None}, {'content': 'sd_15/XXMixUnreal_v1.0.safetensors', 'image': 'checkpoints/sd_15/XXMixUnreal_v1.0.png'}, {'content': 'sd_15_TextEffect/blazingDrive_V08c.safetensors', 'image': 'checkpoints/sd_15_TextEffect/blazingDrive_V08c.jpeg'}, {'content': 'sd_15_TextEffect/dreamlike-anime-1.0.safetensors', 'image': 'checkpoints/sd_15_TextEffect/dreamlike-anime-1.0.jpg'}, {'content': 'sd_15_TextEffect/majicmixRealistic_betterV2V25.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/majicmixRealistic_v6.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/Realistic_Vision_V4.0_fp16-no-ema.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/Realistic_Vision_V5.1_fp16-no-ema.safetensors', 'image': None}, {'content': 'sd_15_TextEffect/revAnimated_v122EOL.safetensors', 'image': None}, {'content': 'sdXL/9527DetailRealistic_v40Lighting4S.safetensors', 'image': 'checkpoints/sdXL/9527DetailRealistic_v40Lighting4S.png'}, {'content': 'sdXL/albedobaseXL_v21.safetensors', 'image': 'checkpoints/sdXL/albedobaseXL_v21.png'}, {'content': 'sdXL/dreamshaperXL_v21TurboDPMSDE.safetensors', 'image': 'checkpoints/sdXL/dreamshaperXL_v21TurboDPMSDE.png'}, {'content': 'sdXL/enjoyXLSuperRealistic_v20.safetensors', 'image': 'checkpoints/sdXL/enjoyXLSuperRealistic_v20.png'}, {'content': 'sdXL/juggernautXL_v9Rdphoto2Lightning.safetensors', 'image': None}, {'content': 'sdXL/mklanRealistic_v220realistic.safetensors', 'image': 'checkpoints/sdXL/mklanRealistic_v220realistic.png'}, {'content': 'sdXL/platypusPhotorealism_v3Lightning.safetensors', 'image': 'checkpoints/sdXL/platypusPhotorealism_v3Lightning.jpeg'}, {'content': 'sdXL/realvisxlV40_v40LightningBakedvae.safetensors', 'image': 'checkpoints/sdXL/realvisxlV40_v40LightningBakedvae.jpeg'}, {'content': 'sdXL/sdxl10ArienmixxlAsian_v45Pruned.safetensors', 'image': 'checkpoints/sdXL/sdxl10ArienmixxlAsian_v45Pruned.png'}, {'content': 'sdXL/sdXL_v10.safetensors', 'image': None}, {'content': 'sdXL/sdXL_v10Refiner.safetensors', 'image': None}, {'content': 'sdXL/二次元/MR_3DQ/MR 3DQ _SDXL V0.2.safetensors', 'image': 'checkpoints/sdXL/二次元/MR_3DQ/MR 3DQ _SDXL V0.2.png'}, {'content': 'SUPIR/SUPIR-v0F_fp16.safetensors', 'image': None}, {'content': 'SUPIR/SUPIR-v0Q_fp16.safetensors', 'image': None}, {'content': 'TripoSR.ckpt', 'image': None}]\n" + ] + } + ], + "source": [ + "def get_name(ele:dict):\n", + " # print(ele)\n", + " name = ele[\"content\"].replace(\"/\", \"__\").lower()\n", + " \n", + " return name\n", + "\n", + "names.sort(key=get_name)\n", + "print(names)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "fooocus", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.10.4" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/test_xformers.py b/test_xformers.py new file mode 100644 index 000000000..514ae09e1 --- /dev/null +++ b/test_xformers.py @@ -0,0 +1,16 @@ +# ref :https://github.com/facebookresearch/xformers/issues/845 + + +import xformers +import xformers.ops +import torch,os +os.environ["MAX_BLOCK_SIZE"] = "655350" +os.environ["CUDA_VISIBLE_DEVICES"] = "3" +os.environ["CUDA_LAUNCH_BLOCKING"] = "1" + +q = torch.zeros(([65536, 16, 80])).cuda() +k = torch.zeros(([65536, 16, 80])).cuda() +v = torch.zeros(([65536, 16, 80])).cuda() +out = xformers.ops.memory_efficient_attention(q, k, v, attn_bias=None) + +print("Done.") \ No newline at end of file diff --git a/yq_run.sh b/yq_run.sh new file mode 100644 index 000000000..c757b23c6 --- /dev/null +++ b/yq_run.sh @@ -0,0 +1,3 @@ +#!/usr/bin/bash + +python main.py --cuda-device 3 --listen "0.0.0.0" --port 38188 \ No newline at end of file