diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c8f6d8..53c322c 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/generate-requirements.sh b/generate-requirements.sh index 3a54046..06b5692 100644 --- a/generate-requirements.sh +++ b/generate-requirements.sh @@ -19,8 +19,6 @@ 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 @@ -31,10 +29,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/storyicon/comfyui_segment_anything/main/requirements.txt -https://raw.githubusercontent.com/ZHO-ZHO-ZHO/ComfyUI-InstantID/main/requirements.txt ) for line in "${array[@]}"; diff --git a/requirements.txt b/requirements.txt index 49a3de4..2fe95ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -accelerate addict aiohttp albumentations @@ -9,7 +8,6 @@ colour-science compel cupy-cuda12x deepdiff -diffusers dill einops fairscale @@ -17,12 +15,9 @@ filelock ftfy fvcore GitPython -gpytoolbox huggingface-hub -imageio imageio-ffmpeg importlib-metadata -jaxtyping joblib kornia lark @@ -30,45 +25,28 @@ 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 @@ -76,7 +54,6 @@ scipy segment-anything sentencepiece simpleeval -slangtorch soundfile spandrel svglib @@ -87,7 +64,6 @@ torchaudio torchdiffeq torchmetrics torchsde -torchtyping torchvision tqdm transformers @@ -96,6 +72,5 @@ trimesh[easy] typer typing-extensions ultralytics!=8.2.87 -xatlas yacs yapf diff --git a/requirements2.txt b/requirements2.txt index cf8f778..d2a77af 100644 --- a/requirements2.txt +++ b/requirements2.txt @@ -1,9 +1 @@ -https://github.com/eddiehe99/dlib-whl/releases/download/v19.24.5/dlib-19.24.5-cp311-cp311-win_amd64.whl -https://raw.githubusercontent.com/Gourieff/Assets/main/Insightface/insightface-0.7.3-cp311-cp311-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 diff --git a/stage1.sh b/stage1.sh index d6cf2a4..a291fcb 100644 --- a/stage1.sh +++ b/stage1.sh @@ -10,25 +10,13 @@ export PYTHONPYCACHEPREFIX="$workdir"/pycache ls -lahF # Setup Python embeded, part 1/3 -curl https://www.python.org/ftp/python/3.11.9/python-3.11.9-embed-amd64.zip \ +curl https://www.python.org/ftp/python/3.12.6/python-3.12.6-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/py311/include \ - "$workdir"/python_embeded/include - -mv \ - "$workdir"/Comfy3D_Pre_Builds/_Python_Source_cpp/py311/libs \ - "$workdir"/python_embeded/libs - # Setup Python embeded, part 2/3 cd "$workdir"/python_embeded -echo 'import site' >> ./python311._pth +echo 'import site' >> ./python312._pth curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py ./python.exe get-pip.py @@ -37,8 +25,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 ./python.exe -s -m pip install \ @@ -56,24 +44,8 @@ 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_py311_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' ./python311._pth +sed -i '1i../ComfyUI' ./python312._pth ./python.exe -s -m pip list diff --git a/stage2.sh b/stage2.sh index f6709e5..256aeb6 100644 --- a/stage2.sh +++ b/stage2.sh @@ -48,11 +48,9 @@ $gcs https://github.com/shiimizu/ComfyUI_smZNodes.git $gcs https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes.git # Control -$gcs https://github.com/cubiq/ComfyUI_InstantID.git $gcs https://github.com/cubiq/ComfyUI_IPAdapter_plus.git $gcs https://github.com/Fannovel16/comfyui_controlnet_aux.git $gcs https://github.com/florestefano1975/comfyui-portrait-master.git -$gcs https://github.com/Gourieff/comfyui-reactor-node.git $gcs https://github.com/huchenlei/ComfyUI-layerdiffuse.git $gcs https://github.com/Kosinkadink/ComfyUI-Advanced-ControlNet.git $gcs https://github.com/ltdrdata/ComfyUI-Inspire-Pack.git @@ -63,18 +61,12 @@ $gcs https://github.com/twri/sdxl_prompt_styler.git # Video $gcs https://github.com/Fannovel16/ComfyUI-Frame-Interpolation.git $gcs https://github.com/FizzleDorf/ComfyUI_FizzNodes.git -$gcs https://github.com/Kosinkadink/ComfyUI-AnimateDiff-Evolved.git $gcs https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite.git -$gcs https://github.com/melMass/comfy_mtb.git -$gcs https://github.com/MrForExample/ComfyUI-AnimateAnyone-Evolved.git # More -$gcs https://github.com/cubiq/ComfyUI_FaceAnalysis.git -$gcs https://github.com/MrForExample/ComfyUI-3D-Pack.git $gcs https://github.com/pythongosssss/ComfyUI-WD14-Tagger.git $gcs https://github.com/SLAPaper/ComfyUI-Image-Selector.git $gcs https://github.com/ssitu/ComfyUI_UltimateSDUpscale.git -$gcs https://github.com/WASasquatch/was-node-suite-comfyui.git cd "$workdir" @@ -92,15 +84,6 @@ cp "$workdir"/attachments/run_nvidia_gpu.bat \ du -hd1 "$workdir" -# Download models for ReActor -cd "$workdir"/ComfyUI_Windows_portable/ComfyUI/models -curl -L https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth \ - --create-dirs -o facerestore_models/codeformer-v0.1.0.pth -curl -L https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth \ - --create-dirs -o facerestore_models/GFPGANv1.4.pth -curl -L https://huggingface.co/datasets/Gourieff/ReActor/resolve/main/models/inswapper_128_fp16.onnx \ - --create-dirs -o insightface/inswapper_128_fp16.onnx - # Download Impact-Pack & Subpack & models cd "$workdir"/ComfyUI_Windows_portable/ComfyUI/custom_nodes $gcs https://github.com/ltdrdata/ComfyUI-Impact-Pack.git @@ -119,7 +102,6 @@ rm "$workdir"/ComfyUI_Windows_portable/*.log #rm -rf "$workdir"/ComfyUI_Windows_portable/python_embeded/Lib/site-packages/pymatting cd "$workdir"/ComfyUI_Windows_portable/ComfyUI/custom_nodes -rm ./was-node-suite-comfyui/was_suite_config.json rm ./ComfyUI-Manager/config.ini rm ./ComfyUI-Impact-Pack/impact-pack.ini rm ./ComfyUI-Custom-Scripts/pysssss.json diff --git a/stage3.sh b/stage3.sh index f32c366..c9024a7 100644 --- a/stage3.sh +++ b/stage3.sh @@ -7,6 +7,6 @@ du -hd1 # LZMA2 is ~75% faster than LZMA, but consumes significant more RAM # Use 2140000000b as volume size just because GitHub think 2147483648b is "larger than 2GB" -"C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma2 -mx=7 -mfb=64 -md=32m -ms=on -mf=BCJ2 -v2140000000b ComfyUI_Windows_portable_cu121.7z ComfyUI_Windows_portable +"C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma2 -mx=7 -mfb=64 -md=32m -ms=on -mf=BCJ2 -v2140000000b ComfyUI_Windows_portable_cu124.7z ComfyUI_Windows_portable ls -lahF