From 0829ba95b8ff452e753d80c8af50674d17b53c89 Mon Sep 17 00:00:00 2001 From: YAN Wenkun Date: Thu, 19 Dec 2024 14:39:04 +0800 Subject: [PATCH] pt25-cu121 & remove flash-attn --- .github/workflows/build-pt25-cu121.yml | 40 +++++++++++++++++++ .../attachments/reinstall-deps-for-3d.bat | 2 +- ...k\344\276\235\350\265\226\351\241\271.bat" | 2 +- pt25-cu121/requirements3.txt | 2 +- pt25-cu121/requirements4.txt | 2 +- pt25-cu121/requirements8.txt | 4 +- pt25-cu121/requirements9.txt | 2 +- pt25-cu121/requirementsA.txt | 2 +- pt25-cu121/stage1.sh | 4 +- 9 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/build-pt25-cu121.yml diff --git a/.github/workflows/build-pt25-cu121.yml b/.github/workflows/build-pt25-cu121.yml new file mode 100644 index 0000000..7500b9c --- /dev/null +++ b/.github/workflows/build-pt25-cu121.yml @@ -0,0 +1,40 @@ +name: "Build & Upload pt25-cu121 Package" + +on: + workflow_dispatch: + +jobs: + build_upload: + permissions: + contents: "write" + packages: "write" + pull-requests: "read" + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + + - name: Stage 1 Gathering Dependencies + shell: bash + working-directory: pt25-cu121 + run: bash stage1.sh + + - name: Stage 2 Assembling Repositories + shell: bash + working-directory: pt25-cu121 + run: bash stage2.sh + + - name: Stage 3 Compressing Package + shell: bash + working-directory: pt25-cu121 + run: bash stage3.sh + + - name: Upload archive to release + uses: xresloader/upload-to-github-release@v1 + env: + # You don't need to configure this token. It'll be auto-set when GitHub Actions start. + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + file: "pt25-cu121/Comfy3D_WinPortable.7z*" + # Always draft before release. + draft: true + overwrite: true diff --git a/pt25-cu121/attachments/reinstall-deps-for-3d.bat b/pt25-cu121/attachments/reinstall-deps-for-3d.bat index 5672e7c..a8893cb 100644 --- a/pt25-cu121/attachments/reinstall-deps-for-3d.bat +++ b/pt25-cu121/attachments/reinstall-deps-for-3d.bat @@ -35,7 +35,7 @@ set PATH=%PATH%;%~dp0\python_embeded\Scripts set CMAKE_ARGS=-DBUILD_opencv_world=ON -DWITH_CUDA=ON -DCUDA_FAST_MATH=ON -DWITH_CUBLAS=ON -DWITH_NVCUVID=ON .\python_embeded\python.exe -s -m pip install --force-reinstall ^ - spconv-cu124 + spconv-cu121 if not exist ".\tmp_build" mkdir tmp_build diff --git "a/pt25-cu121/attachments/\344\270\255\346\226\207\350\204\232\346\234\254/\351\207\215\346\226\260\347\274\226\350\257\221\345\256\211\350\243\2053D-Pack\344\276\235\350\265\226\351\241\271.bat" "b/pt25-cu121/attachments/\344\270\255\346\226\207\350\204\232\346\234\254/\351\207\215\346\226\260\347\274\226\350\257\221\345\256\211\350\243\2053D-Pack\344\276\235\350\265\226\351\241\271.bat" index 958e859..15b8afb 100644 --- "a/pt25-cu121/attachments/\344\270\255\346\226\207\350\204\232\346\234\254/\351\207\215\346\226\260\347\274\226\350\257\221\345\256\211\350\243\2053D-Pack\344\276\235\350\265\226\351\241\271.bat" +++ "b/pt25-cu121/attachments/\344\270\255\346\226\207\350\204\232\346\234\254/\351\207\215\346\226\260\347\274\226\350\257\221\345\256\211\350\243\2053D-Pack\344\276\235\350\265\226\351\241\271.bat" @@ -39,7 +39,7 @@ set PATH=%PATH%;%~dp0\python_embeded\Scripts set CMAKE_ARGS=-DBUILD_opencv_world=ON -DWITH_CUDA=ON -DCUDA_FAST_MATH=ON -DWITH_CUBLAS=ON -DWITH_NVCUVID=ON .\python_embeded\python.exe -s -m pip install --force-reinstall ^ - spconv-cu124 + spconv-cu121 if not exist ".\tmp_build" mkdir tmp_build diff --git a/pt25-cu121/requirements3.txt b/pt25-cu121/requirements3.txt index 3cc4855..78571e1 100644 --- a/pt25-cu121/requirements3.txt +++ b/pt25-cu121/requirements3.txt @@ -1,4 +1,4 @@ ---index-url https://download.pytorch.org/whl/cu124 +--index-url https://download.pytorch.org/whl/cu121 --extra-index-url https://pypi.org/simple xformers==0.0.28.post3 torch==2.5.1 diff --git a/pt25-cu121/requirements4.txt b/pt25-cu121/requirements4.txt index 354cfb3..07f82a8 100644 --- a/pt25-cu121/requirements4.txt +++ b/pt25-cu121/requirements4.txt @@ -28,7 +28,7 @@ scipy sentencepiece soundfile spandrel -spconv-cu124 +spconv-cu121 timm tokenizers torchmetrics diff --git a/pt25-cu121/requirements8.txt b/pt25-cu121/requirements8.txt index 3aa3a68..b652c60 100644 --- a/pt25-cu121/requirements8.txt +++ b/pt25-cu121/requirements8.txt @@ -1 +1,3 @@ -https://huggingface.co/lldacing/flash-attention-windows-wheel/resolve/main/flash_attn-2.7.0.post2%2Bcu124torch2.5.1cxx11abiFALSE-cp312-cp312-win_amd64.whl +# not found binary for flash-attention-windows cu121 pt251 + +#https://huggingface.co/lldacing/flash-attention-windows-wheel/resolve/main/flash_attn-2.7.0.post2%2Bcu124torch2.5.1cxx11abiFALSE-cp312-cp312-win_amd64.whl diff --git a/pt25-cu121/requirements9.txt b/pt25-cu121/requirements9.txt index babb8a1..60dd539 100644 --- a/pt25-cu121/requirements9.txt +++ b/pt25-cu121/requirements9.txt @@ -1,4 +1,4 @@ # https://pip.pypa.io/en/stable/reference/requirements-file-format/ # https://github.com/rusty1s/pytorch_scatter?tab=readme-ov-file#binaries ---find-links https://data.pyg.org/whl/torch-2.5.1%2Bcu124.html +--find-links https://data.pyg.org/whl/torch-2.5.1%2Bcu121.html torch-scatter diff --git a/pt25-cu121/requirementsA.txt b/pt25-cu121/requirementsA.txt index 5049288..1a873eb 100644 --- a/pt25-cu121/requirementsA.txt +++ b/pt25-cu121/requirementsA.txt @@ -1,2 +1,2 @@ ---find-links https://nvidia-kaolin.s3.us-east-2.amazonaws.com/torch-2.5.1_cu124.html +--find-links https://nvidia-kaolin.s3.us-east-2.amazonaws.com/torch-2.5.1_cu121.html kaolin diff --git a/pt25-cu121/stage1.sh b/pt25-cu121/stage1.sh index 7e54400..b9c161c 100644 --- a/pt25-cu121/stage1.sh +++ b/pt25-cu121/stage1.sh @@ -59,8 +59,8 @@ $pip_exe install -r "$workdir"/requirements4.txt $pip_exe install -r "$workdir"/requirements5.txt $pip_exe install -r "$workdir"/requirements6.txt -rm "$workdir"/Comfy3D_Pre_Builds/_Build_Wheels/_Wheels_win_py312_torch2.5.1_cu124/torch_scatter-2.1.2-cp312-cp312-win_amd64.whl -$pip_exe install "$workdir"/Comfy3D_Pre_Builds/_Build_Wheels/_Wheels_win_py312_torch2.5.1_cu124/*.whl +rm "$workdir"/Comfy3D_Pre_Builds/_Build_Wheels/_Wheels_win_py312_torch2.5.0_cu121/torch_scatter-2.1.2-cp312-cp312-win_amd64.whl +$pip_exe install "$workdir"/Comfy3D_Pre_Builds/_Build_Wheels/_Wheels_win_py312_torch2.5.0_cu121/*.whl $pip_exe install -r "$workdir"/requirements8.txt $pip_exe install -r "$workdir"/requirements9.txt