From c4e0ec20b4b566d4bffa4bcb477ac7c750ff377f Mon Sep 17 00:00:00 2001 From: doctorpangloss <@hiddenswitch.com> Date: Mon, 17 Jun 2024 15:10:10 -0700 Subject: [PATCH] Remove bad ideas about releasing an embedded Windows build --- .../windows_release_dependencies.yml | 66 ------------ .../windows_release_nightly_pytorch.yml | 90 ---------------- .github/workflows/windows_release_package.yml | 100 ------------------ 3 files changed, 256 deletions(-) delete mode 100644 .github/workflows/windows_release_dependencies.yml delete mode 100644 .github/workflows/windows_release_nightly_pytorch.yml delete mode 100644 .github/workflows/windows_release_package.yml diff --git a/.github/workflows/windows_release_dependencies.yml b/.github/workflows/windows_release_dependencies.yml deleted file mode 100644 index 681602bdd..000000000 --- a/.github/workflows/windows_release_dependencies.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: "Windows Release dependencies" - -on: - workflow_dispatch: - inputs: - xformers: - description: 'xformers version' - required: false - type: string - default: "" - cu: - description: 'cuda version' - required: true - type: string - default: "121" - - python_minor: - description: 'python minor version' - required: true - type: string - default: "11" - - python_patch: - description: 'python patch version' - required: true - type: string - default: "8" -# push: -# branches: -# - master - -jobs: - build_dependencies: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: 3.${{ inputs.python_minor }}.${{ inputs.python_patch }} - - - shell: bash - run: | - echo "@echo off - call update_comfyui.bat nopause - echo - - echo This will try to update pytorch and all python dependencies. - echo - - echo If you just want to update normally, close this and run update_comfyui.bat instead. - echo - - pause - ..\python_embeded\python.exe -s -m pip install --upgrade torch torchvision ${{ inputs.xformers }} --extra-index-url https://download.pytorch.org/whl/cu${{ inputs.cu }} -r ../ComfyUI/requirements.txt pygit2 - pause" > update_comfyui_and_python_dependencies.bat - - python -m pip wheel --no-cache-dir torch torchvision ${{ inputs.xformers }} --extra-index-url https://download.pytorch.org/whl/cu${{ inputs.cu }} -r requirements.txt pygit2 -w ./temp_wheel_dir - python -m pip install --no-cache-dir ./temp_wheel_dir/* - echo installed basic - ls -lah temp_wheel_dir - mv temp_wheel_dir cu${{ inputs.cu }}_python_deps - tar cf cu${{ inputs.cu }}_python_deps.tar cu${{ inputs.cu }}_python_deps - - - uses: actions/cache/save@v3 - with: - path: | - cu${{ inputs.cu }}_python_deps.tar - update_comfyui_and_python_dependencies.bat - key: ${{ runner.os }}-build-cu${{ inputs.cu }}-${{ inputs.python_minor }} diff --git a/.github/workflows/windows_release_nightly_pytorch.yml b/.github/workflows/windows_release_nightly_pytorch.yml deleted file mode 100644 index d06d0c6a8..000000000 --- a/.github/workflows/windows_release_nightly_pytorch.yml +++ /dev/null @@ -1,90 +0,0 @@ -name: "Windows Release Nightly pytorch" - -on: - workflow_dispatch: - inputs: - cu: - description: 'cuda version' - required: true - type: string - default: "124" - - python_minor: - description: 'python minor version' - required: true - type: string - default: "12" - - python_patch: - description: 'python patch version' - required: true - type: string - default: "3" -# push: -# branches: -# - master - -jobs: - build: - permissions: - contents: "write" - packages: "write" - pull-requests: "read" - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - persist-credentials: false - - uses: actions/setup-python@v4 - with: - python-version: 3.${{ inputs.python_minor }}.${{ inputs.python_patch }} - - shell: bash - run: | - cd .. - cp -r ComfyUI ComfyUI_copy - curl https://www.python.org/ftp/python/3.${{ inputs.python_minor }}.${{ inputs.python_patch }}/python-3.${{ inputs.python_minor }}.${{ inputs.python_patch }}-embed-amd64.zip -o python_embeded.zip - unzip python_embeded.zip -d python_embeded - cd python_embeded - echo 'import site' >> ./python3${{ inputs.python_minor }}._pth - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - ./python.exe get-pip.py - python -m pip wheel torch torchvision mpmath==1.3.0 numpy==1.26.4 --pre --extra-index-url https://download.pytorch.org/whl/nightly/cu${{ inputs.cu }} -r ../ComfyUI/requirements.txt pygit2 -w ../temp_wheel_dir - ls ../temp_wheel_dir - ./python.exe -s -m pip install --pre ../temp_wheel_dir/* - sed -i '1i../ComfyUI' ./python3${{ inputs.python_minor }}._pth - cd .. - - git clone https://github.com/comfyanonymous/taesd - cp taesd/*.pth ./ComfyUI_copy/models/vae_approx/ - - mkdir ComfyUI_windows_portable_nightly_pytorch - mv python_embeded ComfyUI_windows_portable_nightly_pytorch - mv ComfyUI_copy ComfyUI_windows_portable_nightly_pytorch/ComfyUI - - cd ComfyUI_windows_portable_nightly_pytorch - - mkdir update - cp -r ComfyUI/.ci/update_windows/* ./update/ - cp -r ComfyUI/.ci/windows_base_files/* ./ - - echo "call update_comfyui.bat nopause - ..\python_embeded\python.exe -s -m pip install --upgrade --pre torch torchvision --extra-index-url https://download.pytorch.org/whl/nightly/cu${{ inputs.cu }} -r ../ComfyUI/requirements.txt pygit2 - pause" > ./update/update_comfyui_and_python_dependencies.bat - cd .. - - "C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma -mx=8 -mfb=64 -md=32m -ms=on -mf=BCJ2 ComfyUI_windows_portable_nightly_pytorch.7z ComfyUI_windows_portable_nightly_pytorch - mv ComfyUI_windows_portable_nightly_pytorch.7z ComfyUI/ComfyUI_windows_portable_nvidia_or_cpu_nightly_pytorch.7z - - cd ComfyUI_windows_portable_nightly_pytorch - python_embeded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu - - ls - - - name: Upload binaries to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ComfyUI_windows_portable_nvidia_or_cpu_nightly_pytorch.7z - tag: "latest" - overwrite: true diff --git a/.github/workflows/windows_release_package.yml b/.github/workflows/windows_release_package.yml deleted file mode 100644 index 4e3cdabd2..000000000 --- a/.github/workflows/windows_release_package.yml +++ /dev/null @@ -1,100 +0,0 @@ -name: "Windows Release packaging" - -on: - workflow_dispatch: - inputs: - cu: - description: 'cuda version' - required: true - type: string - default: "121" - - python_minor: - description: 'python minor version' - required: true - type: string - default: "11" - - python_patch: - description: 'python patch version' - required: true - type: string - default: "8" -# push: -# branches: -# - master - -jobs: - package_comfyui: - permissions: - contents: "write" - packages: "write" - pull-requests: "read" - runs-on: windows-latest - steps: - - uses: actions/cache/restore@v3 - id: cache - with: - path: | - cu${{ inputs.cu }}_python_deps.tar - update_comfyui_and_python_dependencies.bat - key: ${{ runner.os }}-build-cu${{ inputs.cu }}-${{ inputs.python_minor }} - - shell: bash - run: | - mv cu${{ inputs.cu }}_python_deps.tar ../ - mv update_comfyui_and_python_dependencies.bat ../ - cd .. - tar xf cu${{ inputs.cu }}_python_deps.tar - pwd - ls - - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - persist-credentials: false - - shell: bash - run: | - cd .. - cp -r ComfyUI ComfyUI_copy - curl https://www.python.org/ftp/python/3.${{ inputs.python_minor }}.${{ inputs.python_patch }}/python-3.${{ inputs.python_minor }}.${{ inputs.python_patch }}-embed-amd64.zip -o python_embeded.zip - unzip python_embeded.zip -d python_embeded - cd python_embeded - echo 'import site' >> ./python3${{ inputs.python_minor }}._pth - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - ./python.exe get-pip.py - ./python.exe -s -m pip install ../cu${{ inputs.cu }}_python_deps/* - sed -i '1i../ComfyUI' ./python3${{ inputs.python_minor }}._pth - cd .. - - git clone https://github.com/comfyanonymous/taesd - cp taesd/*.pth ./ComfyUI_copy/models/vae_approx/ - - mkdir ComfyUI_windows_portable - mv python_embeded ComfyUI_windows_portable - mv ComfyUI_copy ComfyUI_windows_portable/ComfyUI - - cd ComfyUI_windows_portable - - mkdir update - cp -r ComfyUI/.ci/update_windows/* ./update/ - cp -r ComfyUI/.ci/windows_base_files/* ./ - cp ../update_comfyui_and_python_dependencies.bat ./update/ - - cd .. - - "C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma -mx=8 -mfb=64 -md=32m -ms=on -mf=BCJ2 ComfyUI_windows_portable.7z ComfyUI_windows_portable - mv ComfyUI_windows_portable.7z ComfyUI/new_ComfyUI_windows_portable_nvidia_cu${{ inputs.cu }}_or_cpu.7z - - cd ComfyUI_windows_portable - python_embeded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu - - ls - - - name: Upload binaries to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: new_ComfyUI_windows_portable_nvidia_cu${{ inputs.cu }}_or_cpu.7z - tag: "latest" - overwrite: true -