The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Update the standalone package updater so it can self update.
comfyanonymous36f7face3732
diff --git a/.ci/update_windows/update.py b/.ci/update_windows/update.pyindex ef9374c44..6067d1a12 100755--- a/.ci/update_windows/update.py+++ b/.ci/update_windows/update.py@@ -1,6 +1,9 @@import pygit2from datetime import datetimeimport sys+import os+import shutil+import filecmpdef pull(repo, remote_name='origin', branch='master'):for remote in repo.remotes:@@ -42,7 +45,8 @@ def pull(repo, remote_name='origin', branch='master'):raise AssertionError('Unknown merge analysis result')pygit2.option(pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0)-repo = pygit2.Repository(str(sys.argv[1]))+repo_path = str(sys.argv[1])+repo = pygit2.Repository(repo_path)ident = pygit2.Signature('comfyui', 'comfy@ui')try:print("stashing current changes")@@ -51,7 +55,10 @@ except KeyError:print("nothing to stash")backup_branch_name = 'backup_branch_{}'.format(datetime.today().strftime('%Y-%m-%d_%H_%M_%S'))print("creating backup branch: {}".format(backup_branch_name))-repo.branches.local.create(backup_branch_name, repo.head.peel())+try:+ repo.branches.local.create(backup_branch_name, repo.head.peel())+except:+ passprint("checking out master branch")branch = repo.lookup_branch('master')@@ -63,3 +70,41 @@ pull(repo)print("Done!")+self_update = True+if len(sys.argv) > 2:+ self_update = '--skip_self_update' not in sys.argv++update_py_path = os.path.realpath(__file__)+repo_update_py_path = os.path.join(repo_path, ".ci/update_windows/update.py")++cur_path = os.path.dirname(update_py_path)+++req_path = os.path.join(cur_path, "current_requirements.txt")+repo_req_path = os.path.join(repo_path, "requirements.txt")+++def files_equal(file1, file2):+ try:+ return filecmp.cmp(file1, file2, shallow=False)+ except:+ return False++def file_size(f):+ try:+ return os.path.getsize(f)+ except:+ return 0+++if self_update and not files_equal(update_py_path, repo_update_py_path) and file_size(repo_update_py_path) > 10:+ shutil.copy(repo_update_py_path, os.path.join(cur_path, "update_new.py"))+ exit()++if not os.path.exists(req_path) or not files_equal(repo_req_path, req_path):+ import subprocess+ try:+ subprocess.check_call([sys.executable, '-m', 'pip', 'install', '-r', repo_req_path])+ shutil.copy(repo_req_path, req_path)+ except:+ passdiff --git a/.ci/update_windows/update_comfyui.bat b/.ci/update_windows/update_comfyui.batindex 60d1e694f..bb08c0de0 100755--- a/.ci/update_windows/update_comfyui.bat+++ b/.ci/update_windows/update_comfyui.bat@@ -1,2 +1,8 @@+@echo off..\python_embeded\python.exe .\update.py ..\ComfyUI\-pause+if exist update_new.py (+ move /y update_new.py update.py+ echo Running updater again since it got updated.+ ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update+)+if "%~1"=="" pausediff --git a/.ci/update_windows/update_comfyui_and_python_dependencies.bat b/.ci/update_windows/update_comfyui_and_python_dependencies.batdeleted file mode 100755index b7308550d..000000000--- a/.ci/update_windows/update_comfyui_and_python_dependencies.bat+++ /dev/null@@ -1,3 +0,0 @@-..\python_embeded\python.exe .\update.py ..\ComfyUI\-..\python_embeded\python.exe -s -m pip install --upgrade torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117 xformers -r ../ComfyUI/requirements.txt pygit2-pausediff --git a/.ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat b/.ci/update_windows_cu118/update_comfyui_and_python_dependencies.batdeleted file mode 100755index c33adc0a7..000000000--- a/.ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat+++ /dev/null@@ -1,11 +0,0 @@-@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 --extra-index-url https://download.pytorch.org/whl/cu118 xformers -r ../ComfyUI/requirements.txt pygit2-pausediff --git a/.github/workflows/windows_release_cu118_dependencies.yml b/.github/workflows/windows_release_cu118_dependencies.ymldeleted file mode 100644index 75c42b624..000000000--- a/.github/workflows/windows_release_cu118_dependencies.yml+++ /dev/null@@ -1,71 +0,0 @@-name: "Windows Release cu118 dependencies"--on:- workflow_dispatch:-# push:-# branches:-# - master--jobs:- build_dependencies:- env:- # you need at least cuda 5.0 for some of the stuff compiled here.- TORCH_CUDA_ARCH_LIST: "5.0+PTX 6.0 6.1 7.0 7.5 8.0 8.6 8.9"- FORCE_CUDA: 1- MAX_JOBS: 1 # will crash otherwise- DISTUTILS_USE_SDK: 1 # otherwise distutils will complain on windows about multiple versions of msvc- XFORMERS_BUILD_TYPE: "Release"- runs-on: windows-latest- steps:- - name: Cache Built Dependencies- uses: actions/cache@v3- id: cache-cu118_python_stuff- with:- path: cu118_python_deps.tar- key: ${{ runner.os }}-build-cu118-- - if: steps.cache-cu118_python_stuff.outputs.cache-hit != 'true'- uses: actions/checkout@v3-- - if: steps.cache-cu118_python_stuff.outputs.cache-hit != 'true'- uses: actions/setup-python@v4- with:- python-version: '3.10.9'-- - if: steps.cache-cu118_python_stuff.outputs.cache-hit != 'true'- uses: comfyanonymous/cuda-toolkit@test- id: cuda-toolkit- with:- cuda: '11.8.0'- # copied from xformers github- - name: Setup MSVC- uses: ilammy/msvc-dev-cmd@v1- - name: Configure Pagefile- # windows runners will OOM with many CUDA architectures- # we cheat here with a page file- uses: al-cheb/[email protected]- with:- minimum-size: 2GB- # really unfortunate: https://github.com/ilammy/msvc-dev-cmd#name-conflicts-with-shell-bash- - name: Remove link.exe- shell: bash- run: rm /usr/bin/link-- - if: steps.cache-cu118_python_stuff.outputs.cache-hit != 'true'- shell: bash- run: |- python -m pip wheel --no-cache-dir torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu118 -r requirements.txt pygit2 -w ./temp_wheel_dir- python -m pip install --no-cache-dir ./temp_wheel_dir/*- echo installed basic- git clone --recurse-submodules https://github.com/facebookresearch/xformers.git- cd xformers- python -m pip install --no-cache-dir wheel setuptools twine- echo building xformers- python setup.py bdist_wheel -d ../temp_wheel_dir/- cd ..- rm -rf xformers- ls -lah temp_wheel_dir- mv temp_wheel_dir cu118_python_deps- tar cf cu118_python_deps.tar cu118_python_deps--diff --git a/.github/workflows/windows_release_cu118_dependencies_2.yml b/.github/workflows/windows_release_cu118_dependencies_2.ymldeleted file mode 100644index a7760b21e..000000000--- a/.github/workflows/windows_release_cu118_dependencies_2.yml+++ /dev/null@@ -1,37 +0,0 @@-name: "Windows Release cu118 dependencies 2"--on:- workflow_dispatch:- inputs:- xformers:- description: 'xformers version'- required: true- type: string- default: "xformers"--# push:-# branches:-# - master--jobs:- build_dependencies:- runs-on: windows-latest- steps:- - uses: actions/checkout@v3- - uses: actions/setup-python@v4- with:- python-version: '3.10.9'-- - shell: bash- run: |- python -m pip wheel --no-cache-dir torch torchvision torchaudio ${{ inputs.xformers }} --extra-index-url https://download.pytorch.org/whl/cu118 -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 cu118_python_deps- tar cf cu118_python_deps.tar cu118_python_deps-- - uses: actions/cache/save@v3- with:- path: cu118_python_deps.tar- key: ${{ runner.os }}-build-cu118diff --git a/.github/workflows/windows_release_cu118_package.yml b/.github/workflows/windows_release_cu118_package.ymldeleted file mode 100644index 0f0fbf280..000000000--- a/.github/workflows/windows_release_cu118_package.yml+++ /dev/null@@ -1,79 +0,0 @@-name: "Windows Release cu118 packaging"--on:- workflow_dispatch:-# 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: cu118_python_deps.tar- key: ${{ runner.os }}-build-cu118- - shell: bash- run: |- mv cu118_python_deps.tar ../- cd ..- tar xf cu118_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.10.9/python-3.10.9-embed-amd64.zip -o python_embeded.zip- unzip python_embeded.zip -d python_embeded- cd python_embeded- echo 'import site' >> ./python310._pth- curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py- ./python.exe get-pip.py- ./python.exe -s -m pip install ../cu118_python_deps/*- sed -i '1i../ComfyUI' ./python310._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/update_windows_cu118/* ./update/- cp -r ComfyUI/.ci/windows_base_files/* ./-- 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_cu118_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_cu118_or_cpu.7z- tag: "latest"- overwrite: true-diff --git a/.github/workflows/windows_release_dependencies.yml b/.github/workflows/windows_release_dependencies.ymlindex aafe8a214..e0841fdf6 100644--- a/.github/workflows/windows_release_dependencies.yml+++ b/.github/workflows/windows_release_dependencies.yml@@ -41,10 +41,9 @@ jobs:- shell: bashrun: |echo "@echo off- ..\python_embeded\python.exe .\update.py ..\ComfyUI\\+ call update_comfyui.bat nopauseecho -- 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 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 -diff --git a/.github/workflows/windows_release_nightly_pytorch.yml b/.github/workflows/windows_release_nightly_pytorch.ymlindex 90e09d27a..568309356 100644--- a/.github/workflows/windows_release_nightly_pytorch.yml+++ b/.github/workflows/windows_release_nightly_pytorch.yml@@ -68,7 +68,7 @@ jobs:cp -r ComfyUI/.ci/update_windows/* ./update/cp -r ComfyUI/.ci/windows_base_files/* ./- echo "..\python_embeded\python.exe .\update.py ..\ComfyUI\\+ echo "call update_comfyui.bat nopause..\python_embeded\python.exe -s -m pip install --upgrade --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cu${{ inputs.cu }} -r ../ComfyUI/requirements.txt pygit2pause" > ./update/update_comfyui_and_python_dependencies.batcd ..