From a20914434bb3609cf1d883cabf048d4cc25f881a Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Thu, 10 Nov 2022 19:37:07 +0000 Subject: [PATCH] change clipseg repo branch to avoid clipseg not found error --- environments-and-requirements/environment-lin-aarch64.yml | 2 +- environments-and-requirements/environment-lin-cuda.yml | 2 +- environments-and-requirements/environment-mac.yml | 2 +- environments-and-requirements/requirements-base.txt | 2 +- installer/install.bat | 4 ++-- installer/install.sh | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/environments-and-requirements/environment-lin-aarch64.yml b/environments-and-requirements/environment-lin-aarch64.yml index e07ebd5114..6ec83b1b0a 100644 --- a/environments-and-requirements/environment-lin-aarch64.yml +++ b/environments-and-requirements/environment-lin-aarch64.yml @@ -39,7 +39,7 @@ dependencies: - test-tube>=0.7.5 - git+https://github.com/openai/CLIP.git@main#egg=clip - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion - - git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg + - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - -e . variables: PYTORCH_ENABLE_MPS_FALLBACK: 1 diff --git a/environments-and-requirements/environment-lin-cuda.yml b/environments-and-requirements/environment-lin-cuda.yml index 352297d750..a75711cfe8 100644 --- a/environments-and-requirements/environment-lin-cuda.yml +++ b/environments-and-requirements/environment-lin-cuda.yml @@ -41,5 +41,5 @@ dependencies: - transformers==4.21.3 - git+https://github.com/openai/CLIP.git@main#egg=clip - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion - - git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg + - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - -e . diff --git a/environments-and-requirements/environment-mac.yml b/environments-and-requirements/environment-mac.yml index 29f5197be9..1ff49ec585 100644 --- a/environments-and-requirements/environment-mac.yml +++ b/environments-and-requirements/environment-mac.yml @@ -58,7 +58,7 @@ dependencies: - git+https://github.com/invoke-ai/k-diffusion.git@mps#egg=k_diffusion - git+https://github.com/invoke-ai/Real-ESRGAN.git#egg=realesrgan - git+https://github.com/invoke-ai/GFPGAN.git#egg=gfpgan - - git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg + - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - -e . variables: PYTORCH_ENABLE_MPS_FALLBACK: 1 diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt index da9a96f0ec..5ae2c75f0b 100644 --- a/environments-and-requirements/requirements-base.txt +++ b/environments-and-requirements/requirements-base.txt @@ -33,4 +33,4 @@ torchmetrics transformers==4.21.* git+https://github.com/openai/CLIP.git@main#egg=clip git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion -git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg +git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg diff --git a/installer/install.bat b/installer/install.bat index c17339e262..1154a7b3e2 100644 --- a/installer/install.bat +++ b/installer/install.bat @@ -19,7 +19,7 @@ set INSTALL_ENV_DIR=%cd%\installer_files\env @rem https://mamba.readthedocs.io/en/latest/installation.html set MICROMAMBA_DOWNLOAD_URL=https://micro.mamba.pm/api/micromamba/win-64/latest set RELEASE_URL=https://github.com/invoke-ai/InvokeAI -set RELEASE_SOURCEBALL=/archive/refs/tags/2.1.3-rc4.tar.gz +set RELEASE_SOURCEBALL=/archive/refs/tags/2.1.3-rc5.tar.gz set PYTHON_BUILD_STANDALONE_URL=https://github.com/indygreg/python-build-standalone/releases/download set PYTHON_BUILD_STANDALONE=20221002/cpython-3.10.7+20221002-x86_64-pc-windows-msvc-shared-install_only.tar.gz @@ -140,7 +140,7 @@ set err_msg=----- main pip install failed ----- if %errorlevel% neq 0 goto err_exit set err_msg=----- clipseg install failed ----- -.venv\Scripts\python -m pip install --no-cache-dir --no-warn-script-location -e git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg +.venv\Scripts\python -m pip install --no-cache-dir --no-warn-script-location -e git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg if %errorlevel% neq 0 goto err_exit set err_msg=----- InvokeAI setup failed ----- diff --git a/installer/install.sh b/installer/install.sh index e7a8b2061b..47e454657f 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -74,7 +74,7 @@ fi INSTALL_ENV_DIR="$(pwd)/installer_files/env" MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${MAMBA_OS_NAME}-${MAMBA_ARCH}/latest" RELEASE_URL=https://github.com/invoke-ai/InvokeAI -RELEASE_SOURCEBALL=/archive/refs/tags/2.1.3-rc4.tar.gz +RELEASE_SOURCEBALL=/archive/refs/tags/2.1.3-rc5.tar.gz PYTHON_BUILD_STANDALONE_URL=https://github.com/indygreg/python-build-standalone/releases/download if [ "$OS_NAME" == "darwin" ]; then PYTHON_BUILD_STANDALONE=20221002/cpython-3.10.7+20221002-${PY_ARCH}-apple-darwin-install_only.tar.gz @@ -184,7 +184,7 @@ _err_msg="\n----- main pip install failed -----\n" _err_exit $? _err_msg _err_msg="\n----- clipseg install failed -----\n" -.venv/bin/python3 -m pip install --no-cache-dir --no-warn-script-location -e git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg +.venv/bin/python3 -m pip install --no-cache-dir --no-warn-script-location -e git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg _err_exit $? _err_msg _err_msg="\n----- InvokeAI setup failed -----\n"