forked from comfyanonymous/ComfyUI
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into multiple-inputs
- Loading branch information
Showing
100 changed files
with
15,630 additions
and
4,482 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| name: Tests CI | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| test: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 18 | ||
| - uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.10' | ||
| - name: Install requirements | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu | ||
| pip install -r requirements.txt | ||
| - name: Run Tests | ||
| run: | | ||
| npm ci | ||
| npm run test:generate | ||
| npm test | ||
| working-directory: ./tests-ui |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| 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: "6" | ||
| # 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 | ||
| ..\python_embeded\python.exe .\update.py ..\ComfyUI\\ | ||
| echo - | ||
| echo This will try to update pytorch and all python dependencies, if you get an error wait for pytorch/xformers to fix their stuff | ||
| echo You should not be running this anyways unless you really have to | ||
| 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 torchaudio ${{ 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 torchaudio ${{ 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 }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| 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: "6" | ||
| # 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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "path-intellisense.mappings": { | ||
| "../": "${workspaceFolder}/web/extensions/core" | ||
| }, | ||
| "[python]": { | ||
| "editor.defaultFormatter": "ms-python.autopep8" | ||
| }, | ||
| "python.formatting.provider": "none" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.