From 346de7b1a1413aedbd058a7274212b3d77950480 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Fri, 14 Feb 2025 20:36:27 -0800 Subject: [PATCH] embeded > embedded --- .ci/update_windows/update_comfyui.bat | 4 ++-- .ci/update_windows/update_comfyui_stable.bat | 4 ++-- .ci/windows_base_files/run_cpu.bat | 2 +- .ci/windows_base_files/run_nvidia_gpu.bat | 2 +- .../run_nvidia_gpu_fast.bat | 2 +- .github/workflows/stable-release.yml | 10 +++++----- .github/workflows/windows_release_dependencies.yml | 2 +- .../workflows/windows_release_nightly_pytorch.yml | 12 ++++++------ .github/workflows/windows_release_package.yml | 10 +++++----- new_updater.py | 4 ++-- server.py | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.ci/update_windows/update_comfyui.bat b/.ci/update_windows/update_comfyui.bat index bb08c0de..725c4db4 100755 --- a/.ci/update_windows/update_comfyui.bat +++ b/.ci/update_windows/update_comfyui.bat @@ -1,8 +1,8 @@ @echo off -..\python_embeded\python.exe .\update.py ..\ComfyUI\ +..\python_embedded\python.exe .\update.py ..\ComfyUI\ 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 + ..\python_embedded\python.exe .\update.py ..\ComfyUI\ --skip_self_update ) if "%~1"=="" pause diff --git a/.ci/update_windows/update_comfyui_stable.bat b/.ci/update_windows/update_comfyui_stable.bat index e18010da..12aa1c11 100755 --- a/.ci/update_windows/update_comfyui_stable.bat +++ b/.ci/update_windows/update_comfyui_stable.bat @@ -1,8 +1,8 @@ @echo off -..\python_embeded\python.exe .\update.py ..\ComfyUI\ --stable +..\python_embedded\python.exe .\update.py ..\ComfyUI\ --stable 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 --stable + ..\python_embedded\python.exe .\update.py ..\ComfyUI\ --skip_self_update --stable ) if "%~1"=="" pause diff --git a/.ci/windows_base_files/run_cpu.bat b/.ci/windows_base_files/run_cpu.bat index c3ba4172..b314cdb3 100755 --- a/.ci/windows_base_files/run_cpu.bat +++ b/.ci/windows_base_files/run_cpu.bat @@ -1,2 +1,2 @@ -.\python_embeded\python.exe -s ComfyUI\main.py --cpu --windows-standalone-build +.\python_embedded\python.exe -s ComfyUI\main.py --cpu --windows-standalone-build pause diff --git a/.ci/windows_base_files/run_nvidia_gpu.bat b/.ci/windows_base_files/run_nvidia_gpu.bat index 274d7c94..c4bdf975 100755 --- a/.ci/windows_base_files/run_nvidia_gpu.bat +++ b/.ci/windows_base_files/run_nvidia_gpu.bat @@ -1,2 +1,2 @@ -.\python_embeded\python.exe -s ComfyUI\main.py --windows-standalone-build +.\python_embedded\python.exe -s ComfyUI\main.py --windows-standalone-build pause diff --git a/.ci/windows_nightly_base_files/run_nvidia_gpu_fast.bat b/.ci/windows_nightly_base_files/run_nvidia_gpu_fast.bat index ca6d6868..94d2e2b8 100644 --- a/.ci/windows_nightly_base_files/run_nvidia_gpu_fast.bat +++ b/.ci/windows_nightly_base_files/run_nvidia_gpu_fast.bat @@ -1,2 +1,2 @@ -.\python_embeded\python.exe -s ComfyUI\main.py --windows-standalone-build --fast +.\python_embedded\python.exe -s ComfyUI\main.py --windows-standalone-build --fast pause diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 9de458b1..868ecfac 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -58,9 +58,9 @@ jobs: 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 + 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_embedded.zip + unzip python_embedded.zip -d python_embedded + cd python_embedded echo ${{ env.MINOR_VERSION }} echo 'import site' >> ./python3${{ inputs.python_minor }}._pth curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py @@ -73,7 +73,7 @@ jobs: cp taesd/*.pth ./ComfyUI_copy/models/vae_approx/ mkdir ComfyUI_windows_portable - mv python_embeded ComfyUI_windows_portable + mv python_embedded ComfyUI_windows_portable mv ComfyUI_copy ComfyUI_windows_portable/ComfyUI cd ComfyUI_windows_portable @@ -89,7 +89,7 @@ jobs: mv ComfyUI_windows_portable.7z ComfyUI/ComfyUI_windows_portable_nvidia.7z cd ComfyUI_windows_portable - python_embeded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu + python_embedded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu ls diff --git a/.github/workflows/windows_release_dependencies.yml b/.github/workflows/windows_release_dependencies.yml index afbbb7af..56cfd606 100644 --- a/.github/workflows/windows_release_dependencies.yml +++ b/.github/workflows/windows_release_dependencies.yml @@ -53,7 +53,7 @@ jobs: 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 + ..\python_embedded\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 }} ${{ inputs.extra_dependencies }} --extra-index-url https://download.pytorch.org/whl/cu${{ inputs.cu }} -r requirements.txt pygit2 -w ./temp_wheel_dir diff --git a/.github/workflows/windows_release_nightly_pytorch.yml b/.github/workflows/windows_release_nightly_pytorch.yml index f9048870..7d38fcc4 100644 --- a/.github/workflows/windows_release_nightly_pytorch.yml +++ b/.github/workflows/windows_release_nightly_pytorch.yml @@ -43,9 +43,9 @@ jobs: 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 + 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_embedded.zip + unzip python_embedded.zip -d python_embedded + cd python_embedded 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 @@ -59,7 +59,7 @@ jobs: cp taesd/*.pth ./ComfyUI_copy/models/vae_approx/ mkdir ComfyUI_windows_portable_nightly_pytorch - mv python_embeded ComfyUI_windows_portable_nightly_pytorch + mv python_embedded ComfyUI_windows_portable_nightly_pytorch mv ComfyUI_copy ComfyUI_windows_portable_nightly_pytorch/ComfyUI cd ComfyUI_windows_portable_nightly_pytorch @@ -70,7 +70,7 @@ jobs: cp -r ComfyUI/.ci/windows_nightly_base_files/* ./ 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 pygit2 + ..\python_embedded\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 pygit2 pause" > ./update/update_comfyui_and_python_dependencies.bat cd .. @@ -78,7 +78,7 @@ jobs: 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 + python_embedded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu ls diff --git a/.github/workflows/windows_release_package.yml b/.github/workflows/windows_release_package.yml index b6840017..73279494 100644 --- a/.github/workflows/windows_release_package.yml +++ b/.github/workflows/windows_release_package.yml @@ -56,9 +56,9 @@ jobs: 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 + 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_embedded.zip + unzip python_embedded.zip -d python_embedded + cd python_embedded 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 @@ -70,7 +70,7 @@ jobs: cp taesd/*.pth ./ComfyUI_copy/models/vae_approx/ mkdir ComfyUI_windows_portable - mv python_embeded ComfyUI_windows_portable + mv python_embedded ComfyUI_windows_portable mv ComfyUI_copy ComfyUI_windows_portable/ComfyUI cd ComfyUI_windows_portable @@ -86,7 +86,7 @@ jobs: 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 + python_embedded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu ls diff --git a/new_updater.py b/new_updater.py index 9a203acd..8a8a502b 100644 --- a/new_updater.py +++ b/new_updater.py @@ -19,14 +19,14 @@ def update_windows_updater(): except: return - if not contents.startswith(b"..\\python_embeded\\python.exe .\\update.py"): + if not contents.startswith(b"..\\python_embedded\\python.exe .\\update.py"): return shutil.copy(updater_path, dest_updater_path) try: with open(dest_bat_deps_path, 'rb') as f: contents = f.read() - contents = contents.replace(b'..\\python_embeded\\python.exe .\\update.py ..\\ComfyUI\\', b'call update_comfyui.bat nopause') + contents = contents.replace(b'..\\python_embedded\\python.exe .\\update.py ..\\ComfyUI\\', b'call update_comfyui.bat nopause') with open(dest_bat_deps_path, 'wb') as f: f.write(contents) except: diff --git a/server.py b/server.py index 76a99167..f7b422c0 100644 --- a/server.py +++ b/server.py @@ -531,7 +531,7 @@ class PromptServer(): "comfyui_version": __version__, "python_version": sys.version, "pytorch_version": comfy.model_management.torch_version, - "embedded_python": os.path.split(os.path.split(sys.executable)[0])[1] == "python_embeded", + "embedded_python": os.path.split(os.path.split(sys.executable)[0])[1] == "python_embedded", "argv": sys.argv }, "devices": [