tmp commit for cu124+py312

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
             # You don't need to cofigure it
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
-            file: "ComfyUI_Windows_portable_cu121.7z*"
+            file: "ComfyUI_Windows_portable_cu124.7z*"
             # always draft before release
             draft: true
             overwrite: true

attachments/run_nvidia_gpu.bat

@@ -21,15 +21,6 @@ set PATH=%PATH%;%~dp0\python_embeded\Scripts
 @REM 该行命令会使 .pyc 文件集中保存在一处。
 set PYTHONPYCACHEPREFIX=%~dp0\pycache
 
-@REM This command will copy u2net.onnx to user's home path, to skip download at first start.
-@REM 该行命令会复制 u2net.onnx 到用户主目录下，以免启动时还需下载。
-IF NOT EXIST "%USERPROFILE%\.u2net\u2net.onnx" (
-    IF EXIST ".\extras\u2net.onnx" (
-        mkdir "%USERPROFILE%\.u2net" 2>nul
-        copy ".\extras\u2net.onnx" "%USERPROFILE%\.u2net\u2net.onnx"
-    )
-)
-
 @REM If you don't want the browser to open automatically, add " --disable-auto-launch" (without quotation marks) to the end of the line below.
 @REM 如果不想要 ComfyUI 启动后自动打开浏览器，添加" --disable-auto-launch"（不含引号）到下行末尾。
 .\python_embeded\python.exe -s ComfyUI\main.py --windows-standalone-build

generate-requirements.sh

@@ -19,12 +19,9 @@ array=(
 https://raw.githubusercontent.com/comfyanonymous/ComfyUI/master/requirements.txt
 https://raw.githubusercontent.com/crystian/ComfyUI-Crystools/main/requirements.txt
 https://raw.githubusercontent.com/cubiq/ComfyUI_essentials/main/requirements.txt
-https://raw.githubusercontent.com/cubiq/ComfyUI_FaceAnalysis/main/requirements.txt
-https://raw.githubusercontent.com/cubiq/ComfyUI_InstantID/main/requirements.txt
 https://raw.githubusercontent.com/Fannovel16/comfyui_controlnet_aux/main/requirements.txt
 https://raw.githubusercontent.com/Fannovel16/ComfyUI-Frame-Interpolation/main/requirements-no-cupy.txt
 https://raw.githubusercontent.com/FizzleDorf/ComfyUI_FizzNodes/main/requirements.txt
-https://raw.githubusercontent.com/Gourieff/comfyui-reactor-node/refs/heads/main/requirements.txt
 https://raw.githubusercontent.com/huchenlei/ComfyUI-layerdiffuse/refs/heads/main/requirements.txt
 https://raw.githubusercontent.com/jags111/efficiency-nodes-comfyui/main/requirements.txt
 https://raw.githubusercontent.com/kijai/ComfyUI-KJNodes/main/requirements.txt
@@ -33,12 +30,7 @@ https://raw.githubusercontent.com/ltdrdata/ComfyUI-Impact-Pack/Main/requirements
 https://raw.githubusercontent.com/ltdrdata/ComfyUI-Impact-Subpack/main/requirements.txt
 https://raw.githubusercontent.com/ltdrdata/ComfyUI-Inspire-Pack/main/requirements.txt
 https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/requirements.txt
-https://raw.githubusercontent.com/melMass/comfy_mtb/main/requirements.txt
-https://raw.githubusercontent.com/MrForExample/ComfyUI-3D-Pack/main/requirements.txt
-https://raw.githubusercontent.com/MrForExample/ComfyUI-AnimateAnyone-Evolved/refs/heads/main/requirements.txt
 https://raw.githubusercontent.com/storyicon/comfyui_segment_anything/main/requirements.txt
-https://raw.githubusercontent.com/WASasquatch/was-node-suite-comfyui/refs/heads/main/requirements.txt
-https://raw.githubusercontent.com/ZHO-ZHO-ZHO/ComfyUI-InstantID/main/requirements.txt
 )
 
 for line in "${array[@]}";

requirements.txt

@@ -1,4 +1,3 @@
-accelerate
 addict
 aiohttp
 albumentations
@@ -17,66 +16,45 @@ filelock
 ftfy
 fvcore
 GitPython
-gpytoolbox
 huggingface-hub
-imageio
 imageio-ffmpeg
 importlib-metadata
-jaxtyping
 joblib
 kornia
 lark
 matplotlib
 matrix-client==0.4.0
 mediapipe
 mss
-nerfacc
-ninja
 numba
 numexpr
 numpy<2
 omegaconf
-onnxruntime
-open-clip-torch
 opencv-contrib-python
 opencv-python
 opencv-python-headless
-packaging
 pandas
-peft
 piexif
 pilgram
 pillow
-plyfile
 psutil
 py-cpuinfo
 pygit2
 PyGithub
-pygltflib
-pyhocon
-PyMCubes
-pymeshlab
 pynvml
 python-dateutil
 python-ffmpeg
-pytorch-lightning
-pytorch-msssim
 pyyaml
-qrcode[pil]
 regex
 rembg
-requests
-requirements-parser
 rich
-rich-argparse
 safetensors
 scikit-image
 scikit-learn
 scipy
 segment-anything
 sentencepiece
 simpleeval
-slangtorch
 soundfile
 spandrel
 svglib
@@ -87,7 +65,6 @@ torchaudio
 torchdiffeq
 torchmetrics
 torchsde
-torchtyping
 torchvision
 tqdm
 transformers
@@ -97,6 +74,5 @@ typer
 typing-extensions
 ultralytics
 webcolors
-xatlas
 yacs
 yapf

requirements2.txt

@@ -1,9 +1 @@
-https://github.com/eddiehe99/dlib-whl/releases/download/v19.24.6-alpha/dlib-19.24.6-cp312-cp312-win_amd64.whl
-https://raw.githubusercontent.com/Gourieff/Assets/refs/heads/main/Insightface/insightface-0.7.3-cp312-cp312-win_amd64.whl
-gradio
-gradio-client
 pixeloe
-git+https://github.com/openai/CLIP.git
-git+https://github.com/WASasquatch/cstr
-git+https://github.com/WASasquatch/ffmpy.git
-git+https://github.com/WASasquatch/img2texture.git

stage1.sh

@@ -16,18 +16,6 @@ curl https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-amd64.zip \
     -o python_embeded.zip
 unzip python_embeded.zip -d "$workdir"/python_embeded
 
-# ComfyUI-3D-Pack, part 1/2
-$gcs https://github.com/MrForExample/Comfy3D_Pre_Builds.git \
-    "$workdir"/Comfy3D_Pre_Builds
-
-mv \
-    "$workdir"/Comfy3D_Pre_Builds/_Python_Source_cpp/py312/include \
-    "$workdir"/python_embeded/include
-
-mv \
-    "$workdir"/Comfy3D_Pre_Builds/_Python_Source_cpp/py312/libs \
-    "$workdir"/python_embeded/libs
-
 # Setup Python embeded, part 2/3
 cd "$workdir"/python_embeded
 echo 'import site' >> ./python312._pth
@@ -39,8 +27,8 @@ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
     --upgrade pip wheel setuptools Cython cmake
 
 ./python.exe -s -m pip install \
-    xformers==0.0.27.post2 torchvision==0.19.0 torchaudio \
-    --index-url https://download.pytorch.org/whl/cu121 \
+    xformers torchvision torchaudio \
+    --index-url https://download.pytorch.org/whl/cu124 \
     --extra-index-url https://pypi.org/simple
 
 # 1. requirements.txt
@@ -63,22 +51,6 @@ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
 ./python.exe -s -m pip install \
     mediapipe
 
-# ComfyUI-3D-Pack, part 2/2
-./python.exe -s -m pip install \
-    "$workdir"/Comfy3D_Pre_Builds/_Build_Wheels/_Wheels_win_py312_torch2.4.0_cu121/*.whl
-
-# From: https://github.com/rusty1s/pytorch_scatter?tab=readme-ov-file#binaries
-./python.exe -s -m pip install \
-    torch-scatter -f https://data.pyg.org/whl/torch-2.4.0%2Bcu121.html
-
-rm -rf "$workdir"/Comfy3D_Pre_Builds
-
-# Add Ninja binary (replacing PIP one)
-curl -L https://github.com/ninja-build/ninja/releases/latest/download/ninja-win.zip \
-    -o ninja-win.zip
-unzip -o ninja-win.zip -d "$workdir"/python_embeded/Scripts
-rm ninja-win.zip
-
 # Setup Python embeded, part 3/3
 sed -i '1i../ComfyUI' ./python312._pth