Skip to content

Commit 8cbbf0b

Browse files
KosinkadinkKosinkadink
committed
Merge branch 'master' into worksplit-multigpu
2 parents c2115a4 + 3374e90 commit 8cbbf0b

File tree

126 files changed

+8687
-5745
lines changed

Some content is hidden

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

126 files changed

+8687
-5745
lines changed

‎.ci/windows_amd_base_files/README_VERY_IMPORTANT.txt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
As of the time of writing this you need this preview driver for best results:
2+
https://www.amd.com/en/resources/support-articles/release-notes/RN-AMDGPU-WINDOWS-PYTORCH-PREVIEW.html
3+
4+
HOW TO RUN:
5+
6+
If you have a AMD gpu:
7+
8+
run_amd_gpu.bat
9+
10+
If you have memory issues you can try disabling the smart memory management by running comfyui with:
11+
12+
run_amd_gpu_disable_smart_memory.bat
13+
14+
IF YOU GET A RED ERROR IN THE UI MAKE SURE YOU HAVE A MODEL/CHECKPOINT IN: ComfyUI\models\checkpoints
15+
16+
You can download the stable diffusion XL one from: https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/blob/main/sd_xl_base_1.0_0.9vae.safetensors
17+
18+
19+
RECOMMENDED WAY TO UPDATE:
20+
To update the ComfyUI code: update\update_comfyui.bat
21+
22+
23+
TO SHARE MODELS BETWEEN COMFYUI AND ANOTHER UI:
24+
In the ComfyUI directory you will find a file: extra_model_paths.yaml.example
25+
Rename this file to: extra_model_paths.yaml and edit it with your favorite text editor.
26+
27+

.ci/windows_base_files/run_nvidia_gpu.bat renamed to .ci/windows_amd_base_files/run_amd_gpu.bat

File renamed without changes.

‎.ci/windows_amd_base_files/run_amd_gpu_disable_smart_memory.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.\python_embeded\python.exe -s ComfyUI\main.py --windows-standalone-build --disable-smart-memory
2+
pause

.ci/windows_base_files/README_VERY_IMPORTANT.txt renamed to .ci/windows_nvidia_base_files/README_VERY_IMPORTANT.txt

File renamed without changes.

.ci/windows_base_files/run_cpu.bat renamed to .ci/windows_nvidia_base_files/run_cpu.bat

File renamed without changes.

‎.ci/windows_nvidia_base_files/run_nvidia_gpu.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.\python_embeded\python.exe -s ComfyUI\main.py --windows-standalone-build
2+
pause

.ci/windows_base_files/run_nvidia_gpu_fast_fp16_accumulation.bat renamed to .ci/windows_nvidia_base_files/run_nvidia_gpu_fast_fp16_accumulation.bat

File renamed without changes.

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: "Release Stable All Portable Versions"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
git_tag:
7+
description: 'Git tag'
8+
required: true
9+
type: string
10+
11+
jobs:
12+
release_nvidia_default:
13+
permissions:
14+
contents: "write"
15+
packages: "write"
16+
pull-requests: "read"
17+
name: "Release NVIDIA Default (cu129)"
18+
uses: ./.github/workflows/stable-release.yml
19+
with:
20+
git_tag: ${{ inputs.git_tag }}
21+
cache_tag: "cu129"
22+
python_minor: "13"
23+
python_patch: "6"
24+
rel_name: "nvidia"
25+
rel_extra_name: ""
26+
test_release: true
27+
secrets: inherit
28+
29+
release_nvidia_cu128:
30+
permissions:
31+
contents: "write"
32+
packages: "write"
33+
pull-requests: "read"
34+
name: "Release NVIDIA cu128"
35+
uses: ./.github/workflows/stable-release.yml
36+
with:
37+
git_tag: ${{ inputs.git_tag }}
38+
cache_tag: "cu128"
39+
python_minor: "12"
40+
python_patch: "10"
41+
rel_name: "nvidia"
42+
rel_extra_name: "_cu128"
43+
test_release: true
44+
secrets: inherit
45+
46+
release_amd_rocm:
47+
permissions:
48+
contents: "write"
49+
packages: "write"
50+
pull-requests: "read"
51+
name: "Release AMD ROCm 6.4.4"
52+
uses: ./.github/workflows/stable-release.yml
53+
with:
54+
git_tag: ${{ inputs.git_tag }}
55+
cache_tag: "rocm644"
56+
python_minor: "12"
57+
python_patch: "10"
58+
rel_name: "amd"
59+
rel_extra_name: ""
60+
test_release: false
61+
secrets: inherit

‎.github/workflows/ruff.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,28 @@ jobs:
2121

2222
- name: Run Ruff
2323
run: ruff check .
24+
25+
pylint:
26+
name: Run Pylint
27+
runs-on: ubuntu-latest
28+
29+
steps:
30+
- name: Checkout repository
31+
uses: actions/checkout@v4
32+
33+
- name: Set up Python
34+
uses: actions/setup-python@v4
35+
with:
36+
python-version: '3.12'
37+
38+
- name: Install requirements
39+
run: |
40+
python -m pip install --upgrade pip
41+
pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
42+
pip install -r requirements.txt
43+
44+
- name: Install Pylint
45+
run: pip install pylint
46+
47+
- name: Run Pylint
48+
run: pylint comfy_api_nodes

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

Lines changed: 79 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,53 @@
22
name: "Release Stable Version"
33

44
on:
5+
workflow_call:
6+
inputs:
7+
git_tag:
8+
description: 'Git tag'
9+
required: true
10+
type: string
11+
cache_tag:
12+
description: 'Cached dependencies tag'
13+
required: true
14+
type: string
15+
default: "cu129"
16+
python_minor:
17+
description: 'Python minor version'
18+
required: true
19+
type: string
20+
default: "13"
21+
python_patch:
22+
description: 'Python patch version'
23+
required: true
24+
type: string
25+
default: "6"
26+
rel_name:
27+
description: 'Release name'
28+
required: true
29+
type: string
30+
default: "nvidia"
31+
rel_extra_name:
32+
description: 'Release extra name'
33+
required: false
34+
type: string
35+
default: ""
36+
test_release:
37+
description: 'Test Release'
38+
required: true
39+
type: boolean
40+
default: true
541
workflow_dispatch:
642
inputs:
743
git_tag:
844
description: 'Git tag'
945
required: true
1046
type: string
11-
cu:
12-
description: 'CUDA version'
47+
cache_tag:
48+
description: 'Cached dependencies tag'
1349
required: true
1450
type: string
15-
default: "129"
51+
default: "cu129"
1652
python_minor:
1753
description: 'Python minor version'
1854
required: true
@@ -23,7 +59,21 @@ on:
2359
required: true
2460
type: string
2561
default: "6"
26-
62+
rel_name:
63+
description: 'Release name'
64+
required: true
65+
type: string
66+
default: "nvidia"
67+
rel_extra_name:
68+
description: 'Release extra name'
69+
required: false
70+
type: string
71+
default: ""
72+
test_release:
73+
description: 'Test Release'
74+
required: true
75+
type: boolean
76+
default: true
2777

2878
jobs:
2979
package_comfy_windows:
@@ -42,15 +92,15 @@ jobs:
4292
id: cache
4393
with:
4494
path: |
45-
cu${{ inputs.cu }}_python_deps.tar
95+
${{ inputs.cache_tag }}_python_deps.tar
4696
update_comfyui_and_python_dependencies.bat
47-
key: ${{ runner.os }}-build-cu${{ inputs.cu }}-${{ inputs.python_minor }}
97+
key: ${{ runner.os }}-build-${{ inputs.cache_tag }}-${{ inputs.python_minor }}
4898
- shell: bash
4999
run: |
50-
mv cu${{ inputs.cu }}_python_deps.tar ../
100+
mv ${{ inputs.cache_tag }}_python_deps.tar ../
51101
mv update_comfyui_and_python_dependencies.bat ../
52102
cd ..
53-
tar xf cu${{ inputs.cu }}_python_deps.tar
103+
tar xf ${{ inputs.cache_tag }}_python_deps.tar
54104
pwd
55105
ls
56106
@@ -65,12 +115,19 @@ jobs:
65115
echo 'import site' >> ./python3${{ inputs.python_minor }}._pth
66116
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
67117
./python.exe get-pip.py
68-
./python.exe -s -m pip install ../cu${{ inputs.cu }}_python_deps/*
118+
./python.exe -s -m pip install ../${{ inputs.cache_tag }}_python_deps/*
119+
120+
grep comfyui ../ComfyUI/requirements.txt > ./requirements_comfyui.txt
121+
./python.exe -s -m pip install -r requirements_comfyui.txt
122+
rm requirements_comfyui.txt
123+
69124
sed -i '1i../ComfyUI' ./python3${{ inputs.python_minor }}._pth
70125
71-
rm ./Lib/site-packages/torch/lib/dnnl.lib #I don't think this is actually used and I need the space
72-
rm ./Lib/site-packages/torch/lib/libprotoc.lib
73-
rm ./Lib/site-packages/torch/lib/libprotobuf.lib
126+
if test -f ./Lib/site-packages/torch/lib/dnnl.lib; then
127+
rm ./Lib/site-packages/torch/lib/dnnl.lib #I don't think this is actually used and I need the space
128+
rm ./Lib/site-packages/torch/lib/libprotoc.lib
129+
rm ./Lib/site-packages/torch/lib/libprotobuf.lib
130+
fi
74131
75132
cd ..
76133
@@ -85,14 +142,18 @@ jobs:
85142
86143
mkdir update
87144
cp -r ComfyUI/.ci/update_windows/* ./update/
88-
cp -r ComfyUI/.ci/windows_base_files/* ./
145+
cp -r ComfyUI/.ci/windows_${{ inputs.rel_name }}_base_files/* ./
89146
cp ../update_comfyui_and_python_dependencies.bat ./update/
90147
91148
cd ..
92149
93150
"C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma2 -mx=9 -mfb=128 -md=768m -ms=on -mf=BCJ2 ComfyUI_windows_portable.7z ComfyUI_windows_portable
94-
mv ComfyUI_windows_portable.7z ComfyUI/ComfyUI_windows_portable_nvidia.7z
151+
mv ComfyUI_windows_portable.7z ComfyUI/ComfyUI_windows_portable_${{ inputs.rel_name }}${{ inputs.rel_extra_name }}.7z
95152
153+
- shell: bash
154+
if: ${{ inputs.test_release }}
155+
run: |
156+
cd ..
96157
cd ComfyUI_windows_portable
97158
python_embeded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu
98159
@@ -101,10 +162,9 @@ jobs:
101162
ls
102163
103164
- name: Upload binaries to release
104-
uses: svenstaro/upload-release-action@v2
165+
uses: softprops/action-gh-release@v2
105166
with:
106-
repo_token: ${{ secrets.GITHUB_TOKEN }}
107-
file: ComfyUI_windows_portable_nvidia.7z
108-
tag: ${{ inputs.git_tag }}
109-
overwrite: true
167+
files: ComfyUI_windows_portable_${{ inputs.rel_name }}${{ inputs.rel_extra_name }}.7z
168+
tag_name: ${{ inputs.git_tag }}
110169
draft: true
170+
overwrite_files: true

0 commit comments

Comments
 (0)