From 59285af8b014c805274db691e5fcc6f7892bdaa0 Mon Sep 17 00:00:00 2001 From: YAN Wenkun Date: Thu, 31 Oct 2024 16:07:50 +0800 Subject: [PATCH] Temp commit for torch==2.3.1+cu121 --- .github/workflows/build.yml | 2 +- stage1.sh | 36 +++++++++++------------------------- stage3.sh | 2 +- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53c322c..9c8f6d8 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_cu124.7z*" + file: "ComfyUI_Windows_portable_cu121.7z*" # always draft before release draft: true overwrite: true diff --git a/stage1.sh b/stage1.sh index 870c5e4..d6dc519 100644 --- a/stage1.sh +++ b/stage1.sh @@ -27,19 +27,6 @@ mv \ rm -rf "$workdir"/Comfy3D_Pre_Builds -# Add missing header for StableFast3D -curl -L https://raw.githubusercontent.com/martinus/unordered_dense/refs/heads/main/include/ankerl/unordered_dense.h \ - --create-dirs -o "$workdir"/python_embeded/include/ankerl/unordered_dense.h - -$gcs https://github.com/shader-slang/slang.git \ - "$workdir"/slang - -mv \ - "$workdir"/slang/include/*.h \ - "$workdir"/python_embeded/include/ - -rm -rf "$workdir"/slang - # Setup Python embeded, part 2/3 cd "$workdir"/python_embeded echo 'import site' >> ./python312._pth @@ -51,8 +38,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.28.post3 torch==2.5.1 torchvision torchaudio \ - --index-url https://download.pytorch.org/whl/cu124 \ + xformers==0.0.27 torch==2.3.1 torchvision torchaudio \ + --index-url https://download.pytorch.org/whl/cu121 \ --extra-index-url https://pypi.org/simple # PIP install @@ -74,16 +61,15 @@ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py # ComfyUI-3D-Pack, part 2/2 ./python.exe -s -m pip install \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/pointnet2_ops-3.0.0-cp312-cp312-win_amd64.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/simple_knn-0.0.0-cp312-cp312-win_amd64.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/diff_gaussian_rasterization-0.0.0-cp312-cp312-win_amd64.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/kiui-0.2.14-py3-none-any.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/nvdiffrast-0.3.3-py3-none-any.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/torch_scatter-2.1.2-cp312-cp312-win_amd64.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/pytorch3d-0.7.8-cp312-cp312-win_amd64.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/texture_baker-0.0.1-cp312-cp312-win_amd64.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/uv_unwrapper-0.0.1-cp312-cp312-win_amd64.whl \ -https://github.com/YanWenKun/ComfyUI-Windows-Portable/releases/download/v6.2-wheels/pynim-0.0.3-cp312-abi3-win_amd64.whl +https://github.com/MrForExample/Comfy3D_Pre_Builds/raw/refs/heads/main/_Build_Wheels/_Wheels_win_py312_torch2.3.0_cu121/simple_knn-0.0.0-cp312-cp312-win_amd64.whl \ +https://github.com/MrForExample/Comfy3D_Pre_Builds/raw/refs/heads/main/_Build_Wheels/_Wheels_win_py312_torch2.3.0_cu121/pointnet2_ops-3.0.0-cp312-cp312-win_amd64.whl \ +https://github.com/MrForExample/Comfy3D_Pre_Builds/raw/refs/heads/main/_Build_Wheels/_Wheels_win_py312_torch2.3.0_cu121/diff_gaussian_rasterization-0.0.0-cp312-cp312-win_amd64.whl \ +https://github.com/MrForExample/Comfy3D_Pre_Builds/raw/refs/heads/main/_Build_Wheels/_Wheels_win_py312_torch2.3.0_cu121/kiui-0.2.10-py3-none-any.whl \ +https://github.com/MrForExample/Comfy3D_Pre_Builds/raw/refs/heads/main/_Build_Wheels/_Wheels_win_py312_torch2.3.0_cu121/nvdiffrast-0.3.1-py3-none-any.whl \ +https://github.com/MrForExample/Comfy3D_Pre_Builds/raw/refs/heads/main/_Build_Wheels/_Wheels_win_py312_torch2.3.0_cu121/pytorch3d-0.7.7-cp312-cp312-win_amd64.whl + +./python.exe -s -m pip install \ + torch-scatter -f https://data.pyg.org/whl/torch-2.3.1%2Bcu121.html # Fix broken dep for mediapipe ./python.exe -s -m pip install \ diff --git a/stage3.sh b/stage3.sh index aa76199..b64761c 100644 --- a/stage3.sh +++ b/stage3.sh @@ -27,6 +27,6 @@ du -hd1 # The file size difference is small. # So I choose the "Normal Compression", not for faster compression time, but for faster decompression time. -"C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma2 -mx=5 -mfb=32 -md=16m -ms=on -mf=BCJ2 -v2140000000b ComfyUI_Windows_portable_cu124.7z ComfyUI_Windows_portable +"C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma2 -mx=5 -mfb=32 -md=16m -ms=on -mf=BCJ2 -v2140000000b ComfyUI_Windows_portable_cu121.7z ComfyUI_Windows_portable ls -lahF