Skip to content

Commit 6e9335d

Browse files
yousef-rafatyousef-rafat
committed
Merge branch 'yousef-higgsv2' of https://github.com/yousef-rafat/ComfyUI into yousef-higgsv2
2 parents df4b6a2 + 1cff9b8 commit 6e9335d

File tree

208 files changed

+24548
-5187
lines changed

Some content is hidden

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

208 files changed

+24548
-5187
lines changed

‎.ci/windows_base_files/README_VERY_IMPORTANT.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ if you have a NVIDIA gpu:
44

55
run_nvidia_gpu.bat
66

7+
if you want to enable the fast fp16 accumulation (faster for fp16 models with slightly less quality):
8+
9+
run_nvidia_gpu_fast_fp16_accumulation.bat
710

811

912
To run it in slow CPU mode:

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/web/assets/** linguist-generated
22
/web/** linguist-vendored
3+
comfy_api_nodes/apis/__init__.py linguist-generated

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ body:
2222
description: Please confirm you have tried to reproduce the issue with all custom nodes disabled.
2323
options:
2424
- label: I have tried disabling custom nodes and the issue persists (see [how to disable custom nodes](https://docs.comfy.org/troubleshooting/custom-node-issues#step-1%3A-test-with-all-custom-nodes-disabled) if you need help)
25-
required: true
25+
required: false
2626
- type: textarea
2727
attributes:
2828
label: Expected Behavior

‎.github/ISSUE_TEMPLATE/user-support.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ body:
1818
description: Please confirm you have tried to reproduce the issue with all custom nodes disabled.
1919
options:
2020
- label: I have tried disabling custom nodes and the issue persists (see [how to disable custom nodes](https://docs.comfy.org/troubleshooting/custom-node-issues#step-1%3A-test-with-all-custom-nodes-disabled) if you need help)
21-
required: true
21+
required: false
2222
- type: textarea
2323
attributes:
2424
label: Your question

‎.github/workflows/check-line-endings.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Check for Windows Line Endings
2+
3+
on:
4+
pull_request:
5+
branches: ['*'] # Trigger on all pull requests to any branch
6+
7+
jobs:
8+
check-line-endings:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v4
14+
with:
15+
fetch-depth: 0 # Fetch all history to compare changes
16+
17+
- name: Check for Windows line endings (CRLF)
18+
run: |
19+
# Get the list of changed files in the PR
20+
CHANGED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }})
21+
22+
# Flag to track if CRLF is found
23+
CRLF_FOUND=false
24+
25+
# Loop through each changed file
26+
for FILE in $CHANGED_FILES; do
27+
# Check if the file exists and is a text file
28+
if [ -f "$FILE" ] && file "$FILE" | grep -q "text"; then
29+
# Check for CRLF line endings
30+
if grep -UP '\r$' "$FILE"; then
31+
echo "Error: Windows line endings (CRLF) detected in $FILE"
32+
CRLF_FOUND=true
33+
fi
34+
fi
35+
done
36+
37+
# Exit with error if CRLF was found
38+
if [ "$CRLF_FOUND" = true ]; then
39+
exit 1
40+
fi

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

Lines changed: 11 additions & 6 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: "128"
15+
default: "129"
1616
python_minor:
1717
description: 'Python minor version'
1818
required: true
1919
type: string
20-
default: "12"
20+
default: "13"
2121
python_patch:
2222
description: 'Python patch version'
2323
required: true
2424
type: string
25-
default: "10"
25+
default: "6"
2626

2727

2828
jobs:
@@ -66,8 +66,13 @@ jobs:
6666
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
6767
./python.exe get-pip.py
6868
./python.exe -s -m pip install ../cu${{ inputs.cu }}_python_deps/*
69-
sed -i '1i../ComfyUI' ./python3${{ inputs.python_minor }}._pth
70-
cd ..
69+
sed -i '1i../ComfyUI' ./python3${{ inputs.python_minor }}._pth
70+
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
74+
75+
cd ..
7176
7277
git clone --depth 1 https://github.com/comfyanonymous/taesd
7378
cp taesd/*.safetensors ./ComfyUI_copy/models/vae_approx/
@@ -85,7 +90,7 @@ jobs:
8590
8691
cd ..
8792
88-
"C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma2 -mx=9 -mfb=128 -md=512m -ms=on -mf=BCJ2 ComfyUI_windows_portable.7z ComfyUI_windows_portable
93+
"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
8994
mv ComfyUI_windows_portable.7z ComfyUI/ComfyUI_windows_portable_nvidia.7z
9095
9196
cd ComfyUI_windows_portable

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Execution 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.12'
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+
pip install -r tests-unit/requirements.txt
28+
- name: Run Execution Tests
29+
run: |
30+
python -m pytest tests/execution -v --skip-timing-checks

‎.github/workflows/windows_release_dependencies.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ on:
1717
description: 'cuda version'
1818
required: true
1919
type: string
20-
default: "128"
20+
default: "129"
2121

2222
python_minor:
2323
description: 'python minor version'
2424
required: true
2525
type: string
26-
default: "12"
26+
default: "13"
2727

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

‎.github/workflows/windows_release_package.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ on:
77
description: 'cuda version'
88
required: true
99
type: string
10-
default: "128"
10+
default: "129"
1111

1212
python_minor:
1313
description: 'python minor version'
1414
required: true
1515
type: string
16-
default: "12"
16+
default: "13"
1717

1818
python_patch:
1919
description: 'python patch version'
2020
required: true
2121
type: string
22-
default: "10"
22+
default: "6"
2323
# push:
2424
# branches:
2525
# - master
@@ -64,6 +64,10 @@ jobs:
6464
./python.exe get-pip.py
6565
./python.exe -s -m pip install ../cu${{ inputs.cu }}_python_deps/*
6666
sed -i '1i../ComfyUI' ./python3${{ inputs.python_minor }}._pth
67+
68+
rm ./Lib/site-packages/torch/lib/dnnl.lib #I don't think this is actually used and I need the space
69+
rm ./Lib/site-packages/torch/lib/libprotoc.lib
70+
rm ./Lib/site-packages/torch/lib/libprotobuf.lib
6771
cd ..
6872
6973
git clone --depth 1 https://github.com/comfyanonymous/taesd
@@ -82,7 +86,7 @@ jobs:
8286
8387
cd ..
8488
85-
"C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma2 -mx=9 -mfb=128 -md=512m -ms=on -mf=BCJ2 ComfyUI_windows_portable.7z ComfyUI_windows_portable
89+
"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
8690
mv ComfyUI_windows_portable.7z ComfyUI/new_ComfyUI_windows_portable_nvidia_cu${{ inputs.cu }}_or_cpu.7z
8791
8892
cd ComfyUI_windows_portable

‎CODEOWNERS‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@
55
# Inlined the team members for now.
66

77
# Maintainers
8-
*.md @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne
9-
/tests/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne
10-
/tests-unit/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne
11-
/notebooks/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne
12-
/script_examples/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne
13-
/.github/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne
14-
/requirements.txt @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne
15-
/pyproject.toml @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne
8+
*.md @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne @guill
9+
/tests/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne @guill
10+
/tests-unit/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne @guill
11+
/notebooks/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne @guill
12+
/script_examples/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne @guill
13+
/.github/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne @guill
14+
/requirements.txt @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne @guill
15+
/pyproject.toml @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @Kosinkadink @christian-byrne @guill
1616

1717
# Python web server
18-
/api_server/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @christian-byrne
19-
/app/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @christian-byrne
20-
/utils/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @christian-byrne
18+
/api_server/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @christian-byrne @guill
19+
/app/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @christian-byrne @guill
20+
/utils/ @yoland68 @robinjhuang @webfiltered @pythongosssss @ltdrdata @christian-byrne @guill
2121

2222
# Node developers
23-
/comfy_extras/ @yoland68 @robinjhuang @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne
24-
/comfy/comfy_types/ @yoland68 @robinjhuang @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne
23+
/comfy_extras/ @yoland68 @robinjhuang @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne @guill
24+
/comfy/comfy_types/ @yoland68 @robinjhuang @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne @guill
25+
/comfy_api_nodes/ @yoland68 @robinjhuang @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne @guill

0 commit comments

Comments
 (0)