diff --git a/Dockerfile b/Dockerfile index f0075d1..f61ce61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,21 +22,27 @@ RUN --mount=type=cache,target=/root/.cache/pip \ pip install --break-system-packages \ --upgrade pip -# Install xFormers (stable version, will specify PyTorch version) -# and Torchvision + Torchaudio (will downgrade to match xFormers' PyTorch version) +# Install PyTorch RUN --mount=type=cache,target=/root/.cache/pip \ pip install --break-system-packages \ - xformers torchvision torchaudio \ + torch torchvision torchaudio \ --index-url https://download.pytorch.org/whl/cu121 \ --extra-index-url https://pypi.org/simple -# Upgrade xFormers to dev version -# (While keeping most dependencies at stable version) -RUN --mount=type=cache,target=/root/.cache/pip \ - pip install --break-system-packages \ - --pre --upgrade xformers \ - --index-url https://download.pytorch.org/whl/cu121 \ - --extra-index-url https://pypi.org/simple +# For anyone who want to use xFormers, uncomment code block below, and comment "PyTorch" part above. +# This code block will be removed in future. +## Install xFormers (stable version, will specify PyTorch version), +## and Torchvision + Torchaudio (will downgrade to match xFormers' PyTorch version). +## Then upgrade xFormers to dev version, while keeping most dependencies at stable version. +# RUN --mount=type=cache,target=/root/.cache/pip \ +# pip install --break-system-packages \ +# xformers torchvision torchaudio \ +# --index-url https://download.pytorch.org/whl/cu121 \ +# --extra-index-url https://pypi.org/simple \ +# && pip install --break-system-packages \ +# --pre --upgrade xformers \ +# --index-url https://download.pytorch.org/whl/cu121 \ +# --extra-index-url https://pypi.org/simple # Install ONNX Runtime(ORT) for CUDA 12.x # ORT is used by DWPose by controlnet_aux. But current ORT release on PyPI only supports CUDA 11.8. diff --git a/docs/chart-concept.svg b/docs/chart-concept.svg index 3c419fc..8c5a481 100644 --- a/docs/chart-concept.svg +++ b/docs/chart-concept.svg @@ -1,4 +1,4 @@ -
Included in this image
Included in this image

Python Packages

PyTorch, xFormers, Accelerate,
OpenCV, Transformers,
Diffusers, InsightFace,
ONNX Runtime
…...

Python Packages...

OS Packages

Python-Develop, PIP, Cython,
Git, GCC-C++,
libGL, aria2
...…

OS Packages...
Easy to update
(by swapping image)
Easy to update...
Will download at first start
File saved locally
Will download at first start...

ComfyUI App

ComfyUI App

ComfyUI
Custom Nodes

ComfyUI-Manager

ComfyUI...
Install more & update all
via ComfyUI-Manager
Install more & update all...
Not come with this image
File saved locally
Not come with this image...

User Models

SD-Models (Checkpoints), LoRAs,
Embeddings
......

User Models...

Misc

User-level Python packages,
Caches,
Logs

MiscUser-level Python packages...
Not affected by updates
Not affected by updates
Download more
via ComfyUI-Manager
Download more...

Functional Models

ControlNet Models,
Upscale Models, CLIP Vision,
VAE
…...
Functional Models...
Only download once
at first start
Only download once...

Stable Cascade
Models

Stage C & B (Checkpoints)

Stable Cascade...
Text is not SVG - cannot display
\ No newline at end of file +
Included in this image
Included in this image

Python Packages

PyTorch, Accelerate,
OpenCV, Transformers,
Diffusers, InsightFace,
ONNX Runtime
…...

Python Packages...

OS Packages

Python-Develop, PIP, Cython,
Git, GCC-C++,
libGL, aria2
...…

OS Packages...
Easy to update
(by swapping image)
Easy to update...
Will download at first start
File saved locally
Will download at first start...

ComfyUI App

ComfyUI App

ComfyUI
Custom Nodes

ComfyUI-Manager

ComfyUI...
Install more & update all
via ComfyUI-Manager
Install more & update all...
Not come with this image
File saved locally
Not come with this image...

User Models

SD-Models (Checkpoints), LoRAs,
Embeddings
......

User Models...

Misc

User-level Python packages,
Caches,
Logs

MiscUser-level Python packages...
Not affected by updates
Not affected by updates
Download more
via ComfyUI-Manager
Download more...

Functional Models

ControlNet Models,
Upscale Models, CLIP Vision,
VAE
…...
Functional Models...
Only download once
at first start
Only download once...

Stable Cascade
Models

Stage C & B (Checkpoints)

Stable Cascade...
Text is not SVG - cannot display
\ No newline at end of file diff --git a/docs/chart-concept.zh.svg b/docs/chart-concept.zh.svg index 57aee3e..3007cf9 100644 --- a/docs/chart-concept.zh.svg +++ b/docs/chart-concept.zh.svg @@ -1,4 +1,4 @@ -
镜像中包含
镜像中包含

系统级 Python 包

PyTorch, xFormers, Accelerate,
OpenCV, Transformers,
Diffusers, InsightFace,
ONNX Runtime
…...

系统级 Python 包...

系统软件包

Python-Develop, PIP, Cython,
Git, GCC-C++,
libGL, aria2
...…

系统软件包Python-Develop, PIP, Cython,...
升级简单
(替换镜像即可)
升级简单 (替换镜像即可)
会在初次启动时下载
文件保存在本地文件夹中
会在初次启动时下载 文件保存在本地文件夹中

ComfyUI App

ComfyUI App

ComfyUI 扩展(Custom Nodes)

ComfyUI-Manager

ComfyUI 扩展(Custom Nodes)...
可使用 ComfyUI-Manager
下载安装更多扩展
并全部更新
可使用 ComfyUI-Manager...
镜像中不含,也不会下载
文件保存在本地文件夹中
镜像中不含,也不会下载 文件保存在本地文件夹中

用户模型

SD 模型 (Checkpoints)
LoRA
Embedding
......

用户模型SD 模型 (Checkpoints)...

其他

用户级 Python 包
缓存
历史

其他用户级 Python 包...
不受更新影响
持久化储存
不受更新影响 持久化储存
可使用 ComfyUI-Manager
下载更多模型
可使用 ComfyUI-Manager...

功能性模型

ControlNet 模型,
图像放大模型, CLIP Vision,
VAE
…...
功能性模型ControlNet 模型,...
只在首次启动时下载一次
只在首次启动时下载一次

Stable Cascade
模型

Stage C & B (Checkpoints)

Stable Cascade...
Text is not SVG - cannot display
\ No newline at end of file +
镜像中包含
镜像中包含

系统级 Python 包

PyTorch, Accelerate,
OpenCV, Transformers,
Diffusers, InsightFace,
ONNX Runtime
…...

系统级 Python 包...

系统软件包

Python-Develop, PIP, Cython,
Git, GCC-C++,
libGL, aria2
...…

系统软件包Python-Develop, PIP, Cython,...
升级简单
(替换镜像即可)
升级简单 (替换镜像即可)
会在初次启动时下载
文件保存在本地文件夹中
会在初次启动时下载 文件保存在本地文件夹中

ComfyUI App

ComfyUI App

ComfyUI 扩展(Custom Nodes)

ComfyUI-Manager

ComfyUI 扩展(Custom Nodes)...
可使用 ComfyUI-Manager
下载安装更多扩展
并全部更新
可使用 ComfyUI-Manager...
镜像中不含,也不会下载
文件保存在本地文件夹中
镜像中不含,也不会下载 文件保存在本地文件夹中

用户模型

SD 模型 (Checkpoints)
LoRA
Embedding
......

用户模型SD 模型 (Checkpoints)...

其他

用户级 Python 包
缓存
历史

其他用户级 Python 包...
不受更新影响
持久化储存
不受更新影响 持久化储存
可使用 ComfyUI-Manager
下载更多模型
可使用 ComfyUI-Manager...

功能性模型

ControlNet 模型,
图像放大模型, CLIP Vision,
VAE
…...
功能性模型ControlNet 模型,...
只在首次启动时下载一次
只在首次启动时下载一次

Stable Cascade
模型

Stage C & B (Checkpoints)

Stable Cascade...
Text is not SVG - cannot display
\ No newline at end of file