Skip to content

Commit 05edf31

Browse files
ifsheldonifsheldon
committed
Merge branch 'upstream' into gempoll
# Conflicts: # web/index.html
2 parents 6f33877 + 61196d8 commit 05edf31

File tree

210 files changed

+132074
-86759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+132074
-86759
lines changed

‎.ci/windows_base_files/README_VERY_IMPORTANT.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ run_cpu.bat
1414

1515
IF YOU GET A RED ERROR IN THE UI MAKE SURE YOU HAVE A MODEL/CHECKPOINT IN: ComfyUI\models\checkpoints
1616

17-
You can download the stable diffusion 1.5 one from: https://huggingface.co/runwayml/stable-diffusion-v1-5/blob/main/v1-5-pruned-emaonly.ckpt
17+
You can download the stable diffusion 1.5 one from: https://huggingface.co/Comfy-Org/stable-diffusion-v1-5-archive/blob/main/v1-5-pruned-emaonly-fp16.safetensors
1818

1919

2020
RECOMMENDED WAY TO UPDATE:

‎.github/workflows/pullrequest-ci-run.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runner_label: [self-hosted, Linux]
2424
flags: ""
2525
- os: windows
26-
runner_label: [self-hosted, win]
26+
runner_label: [self-hosted, Windows]
2727
flags: ""
2828
runs-on: ${{ matrix.runner_label }}
2929
steps:

‎.github/workflows/stable-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ on:
1212
description: 'CUDA version'
1313
required: true
1414
type: string
15-
default: "121"
15+
default: "124"
1616
python_minor:
1717
description: 'Python minor version'
1818
required: true
1919
type: string
20-
default: "11"
20+
default: "12"
2121
python_patch:
2222
description: 'Python patch version'
2323
required: true
2424
type: string
25-
default: "9"
25+
default: "7"
2626

2727

2828
jobs:

‎.github/workflows/stale-issues.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: 'Close stale issues'
2+
on:
3+
schedule:
4+
# Run daily at 430 am PT
5+
- cron: '30 11 * * *'
6+
permissions:
7+
issues: write
8+
9+
jobs:
10+
stale:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/stale@v9
14+
with:
15+
stale-issue-message: "This issue is being marked stale because it has not had any activity for 30 days. Reply below within 7 days if your issue still isn't solved, and it will be left open. Otherwise, the issue will be closed automatically."
16+
days-before-stale: 30
17+
days-before-close: 7
18+
stale-issue-label: 'Stale'
19+
only-labels: 'User Support'
20+
exempt-all-assignees: true
21+
exempt-all-milestones: true

‎.github/workflows/test-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runner_label: [self-hosted, Linux]
3333
flags: ""
3434
- os: windows
35-
runner_label: [self-hosted, win]
35+
runner_label: [self-hosted, Windows]
3636
flags: ""
3737
runs-on: ${{ matrix.runner_label }}
3838
steps:
@@ -55,7 +55,7 @@ jobs:
5555
torch_version: ["nightly"]
5656
include:
5757
- os: windows
58-
runner_label: [self-hosted, win]
58+
runner_label: [self-hosted, Windows]
5959
flags: ""
6060
runs-on: ${{ matrix.runner_label }}
6161
steps:

‎.github/workflows/test-unit.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Unit Tests
2+
3+
on:
4+
push:
5+
branches: [ main, master ]
6+
pull_request:
7+
branches: [ main, master ]
8+
9+
jobs:
10+
test:
11+
strategy:
12+
matrix:
13+
os: [ubuntu-latest, windows-latest, macos-latest]
14+
runs-on: ${{ matrix.os }}
15+
continue-on-error: true
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Set up Python
19+
uses: actions/setup-python@v4
20+
with:
21+
python-version: '3.10'
22+
- name: Install requirements
23+
run: |
24+
python -m pip install --upgrade pip
25+
pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
26+
pip install -r requirements.txt
27+
- name: Run Unit Tests
28+
run: |
29+
pip install -r tests-unit/requirements.txt
30+
python -m pytest tests-unit

‎.github/workflows/windows_release_dependencies.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
description: 'extra dependencies'
1313
required: false
1414
type: string
15-
default: "\"numpy<2\""
15+
default: ""
1616
cu:
1717
description: 'cuda version'
1818
required: true
@@ -23,13 +23,13 @@ on:
2323
description: 'python minor version'
2424
required: true
2525
type: string
26-
default: "11"
26+
default: "12"
2727

2828
python_patch:
2929
description: 'python patch version'
3030
required: true
3131
type: string
32-
default: "9"
32+
default: "7"
3333
# push:
3434
# branches:
3535
# - master

‎.github/workflows/windows_release_package.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
description: 'python minor version'
1414
required: true
1515
type: string
16-
default: "11"
16+
default: "12"
1717

1818
python_patch:
1919
description: 'python patch version'
2020
required: true
2121
type: string
22-
default: "9"
22+
default: "7"
2323
# push:
2424
# branches:
2525
# - master

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ extra_model_paths.yaml
1212
.vscode/
1313
.idea/
1414
venv/
15+
.venv/
1516
/web/extensions/*
1617
!/web/extensions/logging.js.example
1718
!/web/extensions/core/

‎README.md‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div align="center">
22

33
# ComfyUI
4-
**The most powerful and modular stable diffusion GUI and backend.**
4+
**The most powerful and modular diffusion model GUI and backend.**
55

66

77
[![Website][website-shield]][website-url]
@@ -28,7 +28,7 @@
2828
[github-downloads-latest-shield]: https://img.shields.io/github/downloads/comfyanonymous/ComfyUI/latest/total?style=flat&label=downloads%40latest
2929
[github-downloads-link]: https://github.com/comfyanonymous/ComfyUI/releases
3030

31-
![ComfyUI Screenshot](comfyui_screenshot.png)
31+
![ComfyUI Screenshot](https://github.com/user-attachments/assets/7ccaf2c1-9b72-41ae-9a89-5688c94b7abe)
3232
</div>
3333

3434
This ui will let you design and execute advanced stable diffusion pipelines using a graph/nodes/flowchart based interface. For some workflow examples and see what ComfyUI can do you can check out:
@@ -39,7 +39,9 @@ This ui will let you design and execute advanced stable diffusion pipelines usin
3939
## Features
4040
- Nodes/graph/flowchart interface to experiment and create complex Stable Diffusion workflows without needing to code anything.
4141
- Fully supports SD1.x, SD2.x, [SDXL](https://comfyanonymous.github.io/ComfyUI_examples/sdxl/), [Stable Video Diffusion](https://comfyanonymous.github.io/ComfyUI_examples/video/), [Stable Cascade](https://comfyanonymous.github.io/ComfyUI_examples/stable_cascade/), [SD3](https://comfyanonymous.github.io/ComfyUI_examples/sd3/) and [Stable Audio](https://comfyanonymous.github.io/ComfyUI_examples/audio/)
42+
- [LTX-Video](https://comfyanonymous.github.io/ComfyUI_examples/ltxv/)
4243
- [Flux](https://comfyanonymous.github.io/ComfyUI_examples/flux/)
44+
- [Mochi](https://comfyanonymous.github.io/ComfyUI_examples/mochi/)
4345
- Asynchronous Queue system
4446
- Many optimizations: Only re-executes the parts of the workflow that changes between executions.
4547
- Smart memory management: can automatically run models on GPUs with as low as 1GB vram.
@@ -73,35 +75,37 @@ Workflow examples can be found on the [Examples page](https://comfyanonymous.git
7375

7476
| Keybind | Explanation |
7577
|------------------------------------|--------------------------------------------------------------------------------------------------------------------|
76-
| Ctrl + Enter | Queue up current graph for generation |
77-
| Ctrl + Shift + Enter | Queue up current graph as first for generation |
78-
| Ctrl + Alt + Enter | Cancel current generation |
79-
| Ctrl + Z/Ctrl + Y | Undo/Redo |
80-
| Ctrl + S | Save workflow |
81-
| Ctrl + O | Load workflow |
82-
| Ctrl + A | Select all nodes |
83-
| Alt + C | Collapse/uncollapse selected nodes |
84-
| Ctrl + M | Mute/unmute selected nodes |
85-
| Ctrl + B | Bypass selected nodes (acts like the node was removed from the graph and the wires reconnected through) |
86-
| Delete/Backspace | Delete selected nodes |
87-
| Ctrl + Backspace | Delete the current graph |
88-
| Space | Move the canvas around when held and moving the cursor |
89-
| Ctrl/Shift + Click | Add clicked node to selection |
90-
| Ctrl + C/Ctrl + V | Copy and paste selected nodes (without maintaining connections to outputs of unselected nodes) |
91-
| Ctrl + C/Ctrl + Shift + V | Copy and paste selected nodes (maintaining connections from outputs of unselected nodes to inputs of pasted nodes) |
92-
| Shift + Drag | Move multiple selected nodes at the same time |
93-
| Ctrl + D | Load default graph |
94-
| Alt + `+` | Canvas Zoom in |
95-
| Alt + `-` | Canvas Zoom out |
96-
| Ctrl + Shift + LMB + Vertical drag | Canvas Zoom in/out |
97-
| Q | Toggle visibility of the queue |
98-
| H | Toggle visibility of history |
99-
| R | Refresh graph |
78+
| `Ctrl` + `Enter` | Queue up current graph for generation |
79+
| `Ctrl` + `Shift` + `Enter` | Queue up current graph as first for generation |
80+
| `Ctrl` + `Alt` + `Enter` | Cancel current generation |
81+
| `Ctrl` + `Z`/`Ctrl` + `Y` | Undo/Redo |
82+
| `Ctrl` + `S` | Save workflow |
83+
| `Ctrl` + `O` | Load workflow |
84+
| `Ctrl` + `A` | Select all nodes |
85+
| `Alt `+ `C` | Collapse/uncollapse selected nodes |
86+
| `Ctrl` + `M` | Mute/unmute selected nodes |
87+
| `Ctrl` + `B` | Bypass selected nodes (acts like the node was removed from the graph and the wires reconnected through) |
88+
| `Delete`/`Backspace` | Delete selected nodes |
89+
| `Ctrl` + `Backspace` | Delete the current graph |
90+
| `Space` | Move the canvas around when held and moving the cursor |
91+
| `Ctrl`/`Shift` + `Click` | Add clicked node to selection |
92+
| `Ctrl` + `C`/`Ctrl` + `V` | Copy and paste selected nodes (without maintaining connections to outputs of unselected nodes) |
93+
| `Ctrl` + `C`/`Ctrl` + `Shift` + `V` | Copy and paste selected nodes (maintaining connections from outputs of unselected nodes to inputs of pasted nodes) |
94+
| `Shift` + `Drag` | Move multiple selected nodes at the same time |
95+
| `Ctrl` + `D` | Load default graph |
96+
| `Alt` + `+` | Canvas Zoom in |
97+
| `Alt` + `-` | Canvas Zoom out |
98+
| `Ctrl` + `Shift` + LMB + Vertical drag | Canvas Zoom in/out |
99+
| `P` | Pin/Unpin selected nodes |
100+
| `Ctrl` + `G` | Group selected nodes |
101+
| `Q` | Toggle visibility of the queue |
102+
| `H` | Toggle visibility of history |
103+
| `R` | Refresh graph |
100104
| Double-Click LMB | Open node quick search palette |
101-
| Shift + Drag | Move multiple wires at once |
102-
| Ctrl + Alt + LMB | Disconnect all wires from clicked slot |
105+
| `Shift` + Drag | Move multiple wires at once |
106+
| `Ctrl` + `Alt` + LMB | Disconnect all wires from clicked slot |
103107

104-
Ctrl can also be replaced with Cmd instead for macOS users
108+
`Ctrl` can also be replaced with `Cmd` instead for macOS users
105109

106110
# Installing
107111

@@ -125,6 +129,8 @@ To run it on services like paperspace, kaggle or colab you can use my [Jupyter N
125129

126130
## Manual Install (Windows, Linux)
127131

132+
Note that some dependencies do not yet support python 3.13 so using 3.12 is recommended.
133+
128134
Git clone this repo.
129135

130136
Put your SD checkpoints (the huge ckpt/safetensors files) in: models/checkpoints
@@ -135,17 +141,17 @@ Put your VAE in: models/vae
135141
### AMD GPUs (Linux only)
136142
AMD users can install rocm and pytorch with pip if you don't have it already installed, this is the command to install the stable version:
137143

138-
```pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm6.0```
144+
```pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm6.2```
139145

140-
This is the command to install the nightly with ROCm 6.0 which might have some performance improvements:
146+
This is the command to install the nightly with ROCm 6.2 which might have some performance improvements:
141147

142-
```pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.1```
148+
```pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.2```
143149

144150
### NVIDIA
145151

146152
Nvidia users should install stable pytorch using this command:
147153

148-
```pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121```
154+
```pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu124```
149155

150156
This is the command to install pytorch nightly instead which might have performance improvements:
151157

0 commit comments

Comments
 (0)