From f3d682b890cff2881728e5976f1c4f4d33655547 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sun, 27 Nov 2022 13:48:02 +0000 Subject: [PATCH 1/4] tweak setup and environment files for linux & pypatchmatch - Downgrade python requirements to 3.9 because 3.10 is not supported on Ubuntu 20.04 LTS (widely-used distro) - Use our github pypatchmatch 0.1.3 in order to install Makefile where it needs to be. - Restored "-e ." as the last install step on pip installs. Hopefully this will not trigger the high-CPU hang we've previously experienced. --- environments-and-requirements/environment-lin-aarch64.yml | 2 +- environments-and-requirements/environment-lin-amd.yml | 4 ++-- environments-and-requirements/environment-lin-cuda.yml | 4 ++-- environments-and-requirements/environment-mac.yml | 2 +- environments-and-requirements/environment-win-cuda.yml | 4 ++-- environments-and-requirements/requirements-base.txt | 2 +- environments-and-requirements/requirements-lin-cuda.txt | 2 +- environments-and-requirements/requirements-mac-mps-cpu.txt | 2 +- installer/requirements.in | 1 + setup.py | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/environments-and-requirements/environment-lin-aarch64.yml b/environments-and-requirements/environment-lin-aarch64.yml index 5500d4cb6c7..4b211b8bd82 100644 --- a/environments-and-requirements/environment-lin-aarch64.yml +++ b/environments-and-requirements/environment-lin-aarch64.yml @@ -42,5 +42,5 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch + - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/environment-lin-amd.yml b/environments-and-requirements/environment-lin-amd.yml index 69de31aa19d..66b9af962d4 100644 --- a/environments-and-requirements/environment-lin-amd.yml +++ b/environments-and-requirements/environment-lin-amd.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: - - python>=3.9 + - python=3.9.* - pip=22.2.2 - numpy=1.23.3 - pip: @@ -44,5 +44,5 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch + - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/environment-lin-cuda.yml b/environments-and-requirements/environment-lin-cuda.yml index d214ea519e3..71351b5e3c5 100644 --- a/environments-and-requirements/environment-lin-cuda.yml +++ b/environments-and-requirements/environment-lin-cuda.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: - - python=3.10 + - python=3.9.* - pip=22.2.2 - numpy=1.23.3 - torchvision=0.13.1 @@ -43,5 +43,5 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch + - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/environment-mac.yml b/environments-and-requirements/environment-mac.yml index 67489cbc09f..833aa1fc892 100644 --- a/environments-and-requirements/environment-mac.yml +++ b/environments-and-requirements/environment-mac.yml @@ -59,7 +59,7 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch + - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . variables: PYTORCH_ENABLE_MPS_FALLBACK: 1 diff --git a/environments-and-requirements/environment-win-cuda.yml b/environments-and-requirements/environment-win-cuda.yml index 9b43a30540e..1d68eb8b9f9 100644 --- a/environments-and-requirements/environment-win-cuda.yml +++ b/environments-and-requirements/environment-win-cuda.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: - - python>=3.9 + - python=3.10.* - pip=22.2.2 - numpy=1.23.3 - torchvision=0.13.1 @@ -44,5 +44,5 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch + - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt index 19aa0ab66b2..8b388c327db 100644 --- a/environments-and-requirements/requirements-base.txt +++ b/environments-and-requirements/requirements-base.txt @@ -36,4 +36,4 @@ 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@relaxed-python-requirement#egg=clipseg git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch \ No newline at end of file +git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt index 06e6e733669..1578c60334b 100644 --- a/environments-and-requirements/requirements-lin-cuda.txt +++ b/environments-and-requirements/requirements-lin-cuda.txt @@ -1,2 +1,2 @@ -r environments-and-requirements/requirements-base.txt -# -e . +-e . diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt index 54071e73c7f..c388722596e 100644 --- a/environments-and-requirements/requirements-mac-mps-cpu.txt +++ b/environments-and-requirements/requirements-mac-mps-cpu.txt @@ -4,4 +4,4 @@ grpcio<1.51.0 protobuf==3.19.6 torch<1.13.0 torchvision<0.14.0 -# -e . +-e . diff --git a/installer/requirements.in b/installer/requirements.in index ab6b2a1ff5c..385412f2fc0 100644 --- a/installer/requirements.in +++ b/installer/requirements.in @@ -16,6 +16,7 @@ kornia numpy pyreadline3 realesrgan +requests==2.25.1 send2trash streamlit taming-transformers-rom1504 diff --git a/setup.py b/setup.py index 185e98f41e2..220d9af4137 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ def _get_requirements(path): return packages -VERSION = '2.1.4' +VERSION = '2.2.0' DESCRIPTION = ('An implementation of Stable Diffusion which provides various new features' ' and options to aid the image generation process') LONG_DESCRIPTION = ('This version of Stable Diffusion features a slick WebGUI, an' From 4f84dc5561c6f2fe2584f2783799651b3cef390e Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sun, 27 Nov 2022 13:59:50 +0000 Subject: [PATCH 2/4] keep windows on basicsr 1.4.1 --- environments-and-requirements/environment-lin-aarch64.yml | 2 +- environments-and-requirements/environment-win-cuda.yml | 2 +- environments-and-requirements/requirements-base.txt | 1 - environments-and-requirements/requirements-lin-amd.txt | 1 + environments-and-requirements/requirements-lin-arm64.txt | 1 + environments-and-requirements/requirements-lin-cuda.txt | 1 + environments-and-requirements/requirements-mac-mps-cpu.txt | 1 + environments-and-requirements/requirements-win-colab-cuda.txt | 1 + 8 files changed, 7 insertions(+), 3 deletions(-) diff --git a/environments-and-requirements/environment-lin-aarch64.yml b/environments-and-requirements/environment-lin-aarch64.yml index 4b211b8bd82..2eeebca6969 100644 --- a/environments-and-requirements/environment-lin-aarch64.yml +++ b/environments-and-requirements/environment-lin-aarch64.yml @@ -41,6 +41,6 @@ dependencies: - 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@relaxed-python-requirement#egg=clipseg - - git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan + - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/environment-win-cuda.yml b/environments-and-requirements/environment-win-cuda.yml index 1d68eb8b9f9..2f486adea6e 100644 --- a/environments-and-requirements/environment-win-cuda.yml +++ b/environments-and-requirements/environment-win-cuda.yml @@ -43,6 +43,6 @@ dependencies: - 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@relaxed-python-requirement#egg=clipseg - - git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan + - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt index 8b388c327db..2df74a43d74 100644 --- a/environments-and-requirements/requirements-base.txt +++ b/environments-and-requirements/requirements-base.txt @@ -35,5 +35,4 @@ picklescan 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@relaxed-python-requirement#egg=clipseg -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch diff --git a/environments-and-requirements/requirements-lin-amd.txt b/environments-and-requirements/requirements-lin-amd.txt index d627f99861d..e8747aa6f80 100644 --- a/environments-and-requirements/requirements-lin-amd.txt +++ b/environments-and-requirements/requirements-lin-amd.txt @@ -4,4 +4,5 @@ --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org torch torchvision +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-lin-arm64.txt b/environments-and-requirements/requirements-lin-arm64.txt index 304432e4c76..d818bf9d03f 100644 --- a/environments-and-requirements/requirements-lin-arm64.txt +++ b/environments-and-requirements/requirements-lin-arm64.txt @@ -1,3 +1,4 @@ --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu -r environments-and-requirements/requirements-base.txt +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt index 1578c60334b..56c7d971c47 100644 --- a/environments-and-requirements/requirements-lin-cuda.txt +++ b/environments-and-requirements/requirements-lin-cuda.txt @@ -1,2 +1,3 @@ -r environments-and-requirements/requirements-base.txt +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt index c388722596e..b0fe43ee2b2 100644 --- a/environments-and-requirements/requirements-mac-mps-cpu.txt +++ b/environments-and-requirements/requirements-mac-mps-cpu.txt @@ -4,4 +4,5 @@ grpcio<1.51.0 protobuf==3.19.6 torch<1.13.0 torchvision<0.14.0 +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-win-colab-cuda.txt b/environments-and-requirements/requirements-win-colab-cuda.txt index b00f1487fb5..f6f7522e90d 100644 --- a/environments-and-requirements/requirements-win-colab-cuda.txt +++ b/environments-and-requirements/requirements-win-colab-cuda.txt @@ -5,4 +5,5 @@ basicsr==1.4.1 torch==1.12.1 torchvision==0.13.1 +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan -e . From eab2dbc5b8ed2b6357c0d68aae6542ef08e608d3 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sun, 27 Nov 2022 13:59:50 +0000 Subject: [PATCH 3/4] keep windows on basicsr 1.4.1 --- environments-and-requirements/environment-lin-aarch64.yml | 2 +- environments-and-requirements/environment-win-cuda.yml | 2 +- environments-and-requirements/requirements-base.txt | 1 - environments-and-requirements/requirements-lin-amd.txt | 1 + environments-and-requirements/requirements-lin-arm64.txt | 1 + environments-and-requirements/requirements-lin-cuda.txt | 1 + environments-and-requirements/requirements-mac-mps-cpu.txt | 1 + environments-and-requirements/requirements-win-colab-cuda.txt | 1 + 8 files changed, 7 insertions(+), 3 deletions(-) diff --git a/environments-and-requirements/environment-lin-aarch64.yml b/environments-and-requirements/environment-lin-aarch64.yml index 4b211b8bd82..2eeebca6969 100644 --- a/environments-and-requirements/environment-lin-aarch64.yml +++ b/environments-and-requirements/environment-lin-aarch64.yml @@ -41,6 +41,6 @@ dependencies: - 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@relaxed-python-requirement#egg=clipseg - - git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan + - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/environment-win-cuda.yml b/environments-and-requirements/environment-win-cuda.yml index 1d68eb8b9f9..2f486adea6e 100644 --- a/environments-and-requirements/environment-win-cuda.yml +++ b/environments-and-requirements/environment-win-cuda.yml @@ -43,6 +43,6 @@ dependencies: - 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@relaxed-python-requirement#egg=clipseg - - git+https://github.com/invoke-ai/GFPGAN#egg=gfpgan + - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt index 8b388c327db..2df74a43d74 100644 --- a/environments-and-requirements/requirements-base.txt +++ b/environments-and-requirements/requirements-base.txt @@ -35,5 +35,4 @@ picklescan 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@relaxed-python-requirement#egg=clipseg -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch diff --git a/environments-and-requirements/requirements-lin-amd.txt b/environments-and-requirements/requirements-lin-amd.txt index d627f99861d..e8747aa6f80 100644 --- a/environments-and-requirements/requirements-lin-amd.txt +++ b/environments-and-requirements/requirements-lin-amd.txt @@ -4,4 +4,5 @@ --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org torch torchvision +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-lin-arm64.txt b/environments-and-requirements/requirements-lin-arm64.txt index 304432e4c76..d818bf9d03f 100644 --- a/environments-and-requirements/requirements-lin-arm64.txt +++ b/environments-and-requirements/requirements-lin-arm64.txt @@ -1,3 +1,4 @@ --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu -r environments-and-requirements/requirements-base.txt +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt index 1578c60334b..56c7d971c47 100644 --- a/environments-and-requirements/requirements-lin-cuda.txt +++ b/environments-and-requirements/requirements-lin-cuda.txt @@ -1,2 +1,3 @@ -r environments-and-requirements/requirements-base.txt +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt index c388722596e..b0fe43ee2b2 100644 --- a/environments-and-requirements/requirements-mac-mps-cpu.txt +++ b/environments-and-requirements/requirements-mac-mps-cpu.txt @@ -4,4 +4,5 @@ grpcio<1.51.0 protobuf==3.19.6 torch<1.13.0 torchvision<0.14.0 +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-win-colab-cuda.txt b/environments-and-requirements/requirements-win-colab-cuda.txt index b00f1487fb5..f6f7522e90d 100644 --- a/environments-and-requirements/requirements-win-colab-cuda.txt +++ b/environments-and-requirements/requirements-win-colab-cuda.txt @@ -5,4 +5,5 @@ basicsr==1.4.1 torch==1.12.1 torchvision==0.13.1 +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan -e . From f7983a4e3c0918e8c0bcebe9c29cc7ff15459869 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 28 Nov 2022 05:21:40 +0000 Subject: [PATCH 4/4] bump pypatchmatch requirement to 0.1.4 - This brings in a version of pypatchmatch that will gracefully handle internet connection not available at startup time. - Also refactors and simplifies the handling of gfpgan's basicsr requirement across various platforms. --- environments-and-requirements/environment-lin-aarch64.yml | 2 +- environments-and-requirements/environment-lin-amd.yml | 2 +- environments-and-requirements/environment-lin-cuda.yml | 2 +- environments-and-requirements/environment-mac.yml | 2 +- environments-and-requirements/environment-win-cuda.yml | 2 +- environments-and-requirements/requirements-base.txt | 4 +++- environments-and-requirements/requirements-lin-amd.txt | 4 ---- environments-and-requirements/requirements-lin-arm64.txt | 4 ---- environments-and-requirements/requirements-lin-cuda.txt | 1 - environments-and-requirements/requirements-mac-mps-cpu.txt | 2 -- environments-and-requirements/requirements-win-colab-cuda.txt | 2 -- installer/requirements.in | 2 +- 12 files changed, 9 insertions(+), 20 deletions(-) diff --git a/environments-and-requirements/environment-lin-aarch64.yml b/environments-and-requirements/environment-lin-aarch64.yml index 2eeebca6969..315595a37d9 100644 --- a/environments-and-requirements/environment-lin-aarch64.yml +++ b/environments-and-requirements/environment-lin-aarch64.yml @@ -42,5 +42,5 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch + - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/environment-lin-amd.yml b/environments-and-requirements/environment-lin-amd.yml index 66b9af962d4..93344666d20 100644 --- a/environments-and-requirements/environment-lin-amd.yml +++ b/environments-and-requirements/environment-lin-amd.yml @@ -44,5 +44,5 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch + - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/environment-lin-cuda.yml b/environments-and-requirements/environment-lin-cuda.yml index 71351b5e3c5..17b2cddc95d 100644 --- a/environments-and-requirements/environment-lin-cuda.yml +++ b/environments-and-requirements/environment-lin-cuda.yml @@ -43,5 +43,5 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch + - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/environment-mac.yml b/environments-and-requirements/environment-mac.yml index 833aa1fc892..ca1dcc78868 100644 --- a/environments-and-requirements/environment-mac.yml +++ b/environments-and-requirements/environment-mac.yml @@ -59,7 +59,7 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch + - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch - -e . variables: PYTORCH_ENABLE_MPS_FALLBACK: 1 diff --git a/environments-and-requirements/environment-win-cuda.yml b/environments-and-requirements/environment-win-cuda.yml index 2f486adea6e..f71ca666191 100644 --- a/environments-and-requirements/environment-win-cuda.yml +++ b/environments-and-requirements/environment-win-cuda.yml @@ -44,5 +44,5 @@ dependencies: - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch + - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch - -e . diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt index 2df74a43d74..b5e95e0ee0b 100644 --- a/environments-and-requirements/requirements-base.txt +++ b/environments-and-requirements/requirements-base.txt @@ -32,7 +32,9 @@ torch-fidelity torchmetrics transformers==4.21.* picklescan +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan ; platform_system == 'Windows' +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan ; platform_system != 'Windows' 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@relaxed-python-requirement#egg=clipseg -git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch +git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch diff --git a/environments-and-requirements/requirements-lin-amd.txt b/environments-and-requirements/requirements-lin-amd.txt index 42f5a90a52f..ba53c938aa4 100644 --- a/environments-and-requirements/requirements-lin-amd.txt +++ b/environments-and-requirements/requirements-lin-amd.txt @@ -1,10 +1,6 @@ -r environments-and-requirements/requirements-base.txt - -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - # Get hardware-appropriate torch/torchvision --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org torch torchvision -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-lin-arm64.txt b/environments-and-requirements/requirements-lin-arm64.txt index de662a9457b..304432e4c76 100644 --- a/environments-and-requirements/requirements-lin-arm64.txt +++ b/environments-and-requirements/requirements-lin-arm64.txt @@ -1,7 +1,3 @@ --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu - -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan - -r environments-and-requirements/requirements-base.txt -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt index 56c7d971c47..1578c60334b 100644 --- a/environments-and-requirements/requirements-lin-cuda.txt +++ b/environments-and-requirements/requirements-lin-cuda.txt @@ -1,3 +1,2 @@ -r environments-and-requirements/requirements-base.txt -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt index 987071bf7f9..0c957c20a28 100644 --- a/environments-and-requirements/requirements-mac-mps-cpu.txt +++ b/environments-and-requirements/requirements-mac-mps-cpu.txt @@ -1,8 +1,6 @@ -r environments-and-requirements/requirements-base.txt -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan grpcio<1.51.0 protobuf==3.19.6 torch<1.13.0 torchvision<0.14.0 -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -e . diff --git a/environments-and-requirements/requirements-win-colab-cuda.txt b/environments-and-requirements/requirements-win-colab-cuda.txt index 3ce541a41e0..1cb771c37f3 100644 --- a/environments-and-requirements/requirements-win-colab-cuda.txt +++ b/environments-and-requirements/requirements-win-colab-cuda.txt @@ -1,9 +1,7 @@ -r environments-and-requirements/requirements-base.txt -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan # Get hardware-appropriate torch/torchvision --extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https://download.pytorch.org basicsr==1.4.1 torch==1.12.1 torchvision==0.13.1 -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan -e . diff --git a/installer/requirements.in b/installer/requirements.in index 385412f2fc0..cdeaf59a288 100644 --- a/installer/requirements.in +++ b/installer/requirements.in @@ -30,4 +30,4 @@ clip clipseg gfpgan k-diffusion - +pypatchmatch \ No newline at end of file