From 8b7722463e018f74e4a1abc27a100c3c9d71cd01 Mon Sep 17 00:00:00 2001 From: Bubbliiiing <47347516+bubbliiiing@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:57:13 +0800 Subject: [PATCH] rename the comfyui files and new readme (#53) --- README.md | 4 ++-- README_zh-CN.md | 4 ++-- __init__.py | 2 +- {easyanimate/comfyui => comfyui}/README.md | 16 ++++++++++++---- .../comfyui => comfyui}/comfyui_nodes.py | 12 ++++++------ .../easyanimatev3_workflow_i2v.json | 0 .../easyanimatev3_workflow_t2v.json | 0 7 files changed, 23 insertions(+), 15 deletions(-) rename {easyanimate/comfyui => comfyui}/README.md (82%) rename {easyanimate/comfyui => comfyui}/comfyui_nodes.py (97%) rename {easyanimate/comfyui => comfyui}/easyanimatev3_workflow_i2v.json (100%) rename {easyanimate/comfyui => comfyui}/easyanimatev3_workflow_t2v.json (100%) diff --git a/README.md b/README.md index d8a125d..1098136 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ EasyAnimate is a pipeline based on the transformer architecture that can be used We will support quick pull-ups from different platforms, refer to [Quick Start](#quick-start). What's New: -- Support ComfyUI, please refer to [ComfyUI README](easyanimate/comfyui/README.md) for details. [ 2024.07.12 ] +- Support ComfyUI, please refer to [ComfyUI README](comfyui/README.md) for details. [ 2024.07.12 ] - Updated to v3, supports up to 720p 144 frames (960x960, 6s, 24fps) video generation, and supports text and image generated video models. [ 2024.07.01 ] - ModelScope-Sora "Data Directors" creative sprint has been annouced using EasyAnimate as the training backbone to investigate the influence of data preprocessing. Please visit the competition's [official website](https://tianchi.aliyun.com/competition/entrance/532219) for more information. [ 2024.06.17 ] - Updated to v2, supports a maximum of 144 frames (768x768, 6s, 24fps) for generation. [ 2024.05.26 ] @@ -62,7 +62,7 @@ Aliyun provide free GPU time in [Freetier](https://free.aliyun.com/?product=9602 [![DSW Notebook](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/dsw.png)](https://gallery.pai-ml.com/#/preview/deepLearning/cv/easyanimate) #### b. From ComfyUI -Our ComfyUI is as follows, please refer to [ComfyUI README](easyanimate/comfyui/README.md) for details. +Our ComfyUI is as follows, please refer to [ComfyUI README](comfyui/README.md) for details. ![workflow graph](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/v3/comfyui_i2v.jpg) #### c. From docker diff --git a/README_zh-CN.md b/README_zh-CN.md index 8b2d1dd..8f66c18 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -31,7 +31,7 @@ EasyAnimate是一个基于transformer结构的pipeline，可用于生成AI图片 我们会逐渐支持从不同平台快速启动，请参阅 [快速启动](#快速启动)。 新特性： -- 支持comfyui，详情查看[ComfyUI README](easyanimate/comfyui/README.md)。[ 2024.07.12 ] +- 支持comfyui，详情查看[ComfyUI README](comfyui/README.md)。[ 2024.07.12 ] - 更新到v3版本，最大支持720p 144帧(960x960, 6s, 24fps)视频生成，支持文与图生视频模型。[ 2024.07.01 ] - ModelScope-Sora“数据导演”创意竞速——第三届Data-Juicer大模型数据挑战赛已经正式启动！其使用EasyAnimate作为基础模型，探究数据处理对于模型训练的作用。立即访问[竞赛官网](https://tianchi.aliyun.com/competition/entrance/532219)，了解赛事详情。[ 2024.06.17 ] - 更新到v2版本，最大支持144帧(768x768, 6s, 24fps)生成。[ 2024.05.26 ] @@ -59,7 +59,7 @@ DSW 有免费 GPU 时间，用户可申请一次，申请后3个月内有效。 [![DSW Notebook](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/dsw.png)](https://gallery.pai-ml.com/#/preview/deepLearning/cv/easyanimate) #### b. 通过ComfyUI -我们的ComfyUI界面如下，具体查看[ComfyUI README](easyanimate/comfyui/README.md)。 +我们的ComfyUI界面如下，具体查看[ComfyUI README](comfyui/README.md)。 ![workflow graph](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/v3/comfyui_i2v.jpg) #### c. 通过docker diff --git a/__init__.py b/__init__.py index d97218c..273bba3 100644 --- a/__init__.py +++ b/__init__.py @@ -1,3 +1,3 @@ -from .easyanimate.comfyui.comfyui_nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS +from .comfyui.comfyui_nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS __all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"] diff --git a/easyanimate/comfyui/README.md b/comfyui/README.md similarity index 82% rename from easyanimate/comfyui/README.md rename to comfyui/README.md index 50ff547..0553513 100644 --- a/easyanimate/comfyui/README.md +++ b/comfyui/README.md @@ -18,9 +18,17 @@ Easily use EasyAnimate inside ComfyUI! TBD ### Option 2: Install manually +The EasyAnimate repository needs to be placed at `ComfyUI/custom_nodes/EasyAnimate/`. + ``` cd ComfyUI/custom_nodes/ + +# Git clone the easyanimate itself git clone https://github.com/aigc-apps/EasyAnimate.git + +# Git clone the video outout node +git clone https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite.git + cd EasyAnimate/ python install.py ``` @@ -45,14 +53,14 @@ EasyAnimateV3: ## Example workflows -### Image to video -Our ui is shown as follow: +### Image to video generation +Our ui is shown as follow, this is the [download link](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/v3/easyanimatev3_workflow_i2v.json) of the json: ![workflow graph](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/v3/comfyui_i2v.jpg) You can run the demo using following photo: ![demo image](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/v3/firework.png) -### Image to video generation (high FPS w/ frame interpolation) -Our ui is shown as follow: +### Text to video generation +Our ui is shown as follow, this is the [download link](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/v3/easyanimatev3_workflow_t2v.json) of the json: ![workflow graph](https://pai-aigc-photog.oss-cn-hangzhou.aliyuncs.com/easyanimate/asset/v3/comfyui_t2v.jpg) \ No newline at end of file diff --git a/easyanimate/comfyui/comfyui_nodes.py b/comfyui/comfyui_nodes.py similarity index 97% rename from easyanimate/comfyui/comfyui_nodes.py rename to comfyui/comfyui_nodes.py index 422a46b..b28f01f 100644 --- a/easyanimate/comfyui/comfyui_nodes.py +++ b/comfyui/comfyui_nodes.py @@ -16,16 +16,16 @@ import comfy.model_management as mm import folder_paths from comfy.utils import ProgressBar, load_torch_file -from ..models.autoencoder_magvit import AutoencoderKLMagvit -from ..models.transformer3d import Transformer3DModel -from ..pipeline.pipeline_easyanimate_inpaint import EasyAnimateInpaintPipeline -from ..utils.utils import get_image_to_video_latent -from ..data.bucket_sampler import ASPECT_RATIO_512, get_closest_ratio +from ..easyanimate.models.autoencoder_magvit import AutoencoderKLMagvit +from ..easyanimate.models.transformer3d import Transformer3DModel +from ..easyanimate.pipeline.pipeline_easyanimate_inpaint import EasyAnimateInpaintPipeline +from ..easyanimate.utils.utils import get_image_to_video_latent +from ..easyanimate.data.bucket_sampler import ASPECT_RATIO_512, get_closest_ratio # Compatible with Alibaba EAS for quick launch eas_cache_dir = '/stable-diffusion-cache/models' # The directory of the easyanimate -script_directory = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +script_directory = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) def tensor2pil(image): return Image.fromarray(np.clip(255. * image.cpu().numpy(), 0, 255).astype(np.uint8)) diff --git a/easyanimate/comfyui/easyanimatev3_workflow_i2v.json b/comfyui/easyanimatev3_workflow_i2v.json similarity index 100% rename from easyanimate/comfyui/easyanimatev3_workflow_i2v.json rename to comfyui/easyanimatev3_workflow_i2v.json diff --git a/easyanimate/comfyui/easyanimatev3_workflow_t2v.json b/comfyui/easyanimatev3_workflow_t2v.json similarity index 100% rename from easyanimate/comfyui/easyanimatev3_workflow_t2v.json rename to comfyui/easyanimatev3_workflow_t2v.json