From 865439114bc6621fa18e4be23cb0081e3121df41 Mon Sep 17 00:00:00 2001 From: Sammy Date: Wed, 7 Dec 2022 22:33:09 +0100 Subject: [PATCH] Arch Specific Patchmatch Instructions + Fixing linux conda installation --- docs/installation/INSTALL_PATCHMATCH.md | 35 +++++++++++++++++-- .../environment-lin-aarch64.yml | 2 +- .../environment-lin-amd.yml | 2 +- .../environment-lin-cuda.yml | 2 +- .../environment-mac.yml | 2 +- .../environment-win-cuda.yml | 2 +- 6 files changed, 37 insertions(+), 8 deletions(-) diff --git a/docs/installation/INSTALL_PATCHMATCH.md b/docs/installation/INSTALL_PATCHMATCH.md index 31afcdb1a3..ede5773e48 100644 --- a/docs/installation/INSTALL_PATCHMATCH.md +++ b/docs/installation/INSTALL_PATCHMATCH.md @@ -26,6 +26,9 @@ it. Prior to installing PyPatchMatch, you need to take the following steps: +### Debian Based Distros + + 1. Install the `build-essential` tools: ``` @@ -44,6 +47,7 @@ steps: ``` cd /usr/lib/x86_64-linux-gnu/pkgconfig/ ln -sf opencv4.pc opencv.pc + ``` 4. Activate the environment you use for invokeai, either with `conda` or with a virtual environment. @@ -51,7 +55,7 @@ steps: 5. Do a "develop" install of pypatchmatch: ``` - pip install -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch + pip install -e "git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch" ``` 6. Confirm that pypatchmatch is installed. @@ -79,8 +83,33 @@ steps: [link] libpatchmatch.so ... ``` + +### Arch Based Distros + +1. Install the `base-devel` package: + ``` + sudo pacman -Syu + sudo pacman -S --needed base-devel + ``` + +2. Install `opencv`: + ``` + sudo pacman -S opencv + ``` + or for CUDA support + ``` + sudo pacman -S opencv-cuda + ``` + +3. Fix the naming of the `opencv` package configuration file: + ``` + cd /usr/lib/pkgconfig/ + ln -sf opencv4.pc opencv.pc + ``` + +**Next, Follow Steps 4-6 from the Debian Section above** + + If you see no errors, then you're ready to go! - - diff --git a/environments-and-requirements/environment-lin-aarch64.yml b/environments-and-requirements/environment-lin-aarch64.yml index 315595a37d..5f71828453 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 - - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch + - 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 93344666d2..d9badf3455 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 - - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch + - 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 17b2cddc95..a938dc7b6f 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 - - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch + - 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 ca1dcc7886..f2b598920b 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 - - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch + - 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 f71ca66619..6bb9de1d87 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 - - -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch + - git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch - -e .