From 48ad0c289c770b95551b4bfd27da9aa4a0e22b4d Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Thu, 17 Nov 2022 12:56:18 +1100 Subject: [PATCH] Rebases on dev, updates new env files w/ patchmatch --- environment-AMD.yml | 46 ------------------- .../environment-lin-aarch64.yml | 1 + .../environment-lin-amd.yml | 1 + .../environment-lin-cuda.yml | 1 + .../environment-mac.yml | 1 + .../environment-win-cuda.yml | 1 + .../requirements-base.txt | 1 + frontend/src/features/gallery/gallerySlice.ts | 2 - 8 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 environment-AMD.yml diff --git a/environment-AMD.yml b/environment-AMD.yml deleted file mode 100644 index 5a0e46998d..0000000000 --- a/environment-AMD.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: invokeai -channels: - - pytorch - - conda-forge - - defaults -dependencies: - - python>=3.9 - - pip=22.2.2 - - numpy=1.23.3 - - pip: - - --extra-index-url https://download.pytorch.org/whl/rocm5.2/ - - albumentations==0.4.3 - - dependency_injector==4.40.0 - - diffusers==0.6.0 - - einops==0.3.0 - - eventlet - - flask==2.1.3 - - flask_cors==3.0.10 - - flask_socketio==5.3.0 - - getpass_asterisk - - imageio-ffmpeg==0.4.2 - - imageio==2.9.0 - - kornia==0.6.0 - - omegaconf==2.2.3 - - opencv-python==4.5.5.64 - - pillow==9.2.0 - - pudb==2019.2 - - pyreadline3 - - pytorch-lightning==1.7.7 - - send2trash==1.8.0 - - streamlit==1.12.0 - - taming-transformers-rom1504 - - test-tube>=0.7.5 - - torch - - torch-fidelity==0.3.0 - - torchaudio - - torchmetrics==0.7.0 - - torchvision - - 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/Real-ESRGAN.git#egg=realesrgan - - git+https://github.com/invoke-ai/GFPGAN.git#egg=gfpgan - - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg - - git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch - - -e . diff --git a/environments-and-requirements/environment-lin-aarch64.yml b/environments-and-requirements/environment-lin-aarch64.yml index 4472c2fff7..5500d4cb6c 100644 --- a/environments-and-requirements/environment-lin-aarch64.yml +++ b/environments-and-requirements/environment-lin-aarch64.yml @@ -42,4 +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 - -e . diff --git a/environments-and-requirements/environment-lin-amd.yml b/environments-and-requirements/environment-lin-amd.yml index 8388a84206..69de31aa19 100644 --- a/environments-and-requirements/environment-lin-amd.yml +++ b/environments-and-requirements/environment-lin-amd.yml @@ -44,4 +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 - -e . diff --git a/environments-and-requirements/environment-lin-cuda.yml b/environments-and-requirements/environment-lin-cuda.yml index 895515d43a..d214ea519e 100644 --- a/environments-and-requirements/environment-lin-cuda.yml +++ b/environments-and-requirements/environment-lin-cuda.yml @@ -43,4 +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 - -e . diff --git a/environments-and-requirements/environment-mac.yml b/environments-and-requirements/environment-mac.yml index 9bf8e27952..67489cbc09 100644 --- a/environments-and-requirements/environment-mac.yml +++ b/environments-and-requirements/environment-mac.yml @@ -59,6 +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 - -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 d42aa62a3d..9b43a30540 100644 --- a/environments-and-requirements/environment-win-cuda.yml +++ b/environments-and-requirements/environment-win-cuda.yml @@ -44,4 +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 - -e . diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt index a59cdee138..19aa0ab66b 100644 --- a/environments-and-requirements/requirements-base.txt +++ b/environments-and-requirements/requirements-base.txt @@ -36,3 +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 diff --git a/frontend/src/features/gallery/gallerySlice.ts b/frontend/src/features/gallery/gallerySlice.ts index 0b6c487c17..7d397401ae 100644 --- a/frontend/src/features/gallery/gallerySlice.ts +++ b/frontend/src/features/gallery/gallerySlice.ts @@ -6,8 +6,6 @@ import { IRect } from 'konva/lib/types'; import { InvokeTabName } from 'features/tabs/InvokeTabs'; import { mergeAndUploadCanvas } from 'features/canvas/util/mergeAndUploadCanvas'; import { uploadImage } from './util/uploadImage'; -import { setInitialImage } from 'features/options/optionsSlice'; -import { setImageToInpaint } from 'features/canvas/canvasSlice'; export type GalleryCategory = 'user' | 'result';