Skip to content

Commit 8654391

Browse files
SammCheeselstein
authored andcommitted
Arch Specific Patchmatch Instructions + Fixing linux conda installation
1 parent 4d76116 commit 8654391

6 files changed

Lines changed: 36 additions & 7 deletions

File tree

docs/installation/INSTALL_PATCHMATCH.md

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ it.
2626
Prior to installing PyPatchMatch, you need to take the following
2727
steps:
2828

29+
### Debian Based Distros
30+
31+
2932
1. Install the `build-essential` tools:
3033

3134
```
@@ -44,14 +47,15 @@ steps:
4447
```
4548
cd /usr/lib/x86_64-linux-gnu/pkgconfig/
4649
ln -sf opencv4.pc opencv.pc
50+
```
4751

4852
4. Activate the environment you use for invokeai, either with
4953
`conda` or with a virtual environment.
5054

5155
5. Do a "develop" install of pypatchmatch:
5256

5357
```
54-
pip install -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch
58+
pip install -e "git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch"
5559
```
5660

5761
6. Confirm that pypatchmatch is installed.
@@ -79,8 +83,33 @@ steps:
7983
[link] libpatchmatch.so ...
8084
```
8185

82-
If you see no errors, then you're ready to go!
8386

87+
### Arch Based Distros
8488

89+
1. Install the `base-devel` package:
90+
```
91+
sudo pacman -Syu
92+
sudo pacman -S --needed base-devel
93+
```
94+
95+
2. Install `opencv`:
96+
```
97+
sudo pacman -S opencv
98+
```
99+
or for CUDA support
100+
```
101+
sudo pacman -S opencv-cuda
102+
```
103+
104+
3. Fix the naming of the `opencv` package configuration file:
105+
```
106+
cd /usr/lib/pkgconfig/
107+
ln -sf opencv4.pc opencv.pc
108+
```
109+
110+
**Next, Follow Steps 4-6 from the Debian Section above**
111+
112+
113+
If you see no errors, then you're ready to go!
85114

86115

environments-and-requirements/environment-lin-aarch64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ dependencies:
4242
- git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
4343
- git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
4444
- git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
45-
- -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
45+
- git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
4646
- -e .

environments-and-requirements/environment-lin-amd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ dependencies:
4444
- git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
4545
- git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
4646
- git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
47-
- -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
47+
- git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
4848
- -e .

environments-and-requirements/environment-lin-cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ dependencies:
4343
- git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
4444
- git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
4545
- git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
46-
- -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
46+
- git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
4747
- -e .

environments-and-requirements/environment-mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies:
5959
- git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
6060
- git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
6161
- git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
62-
- -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
62+
- git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
6363
- -e .
6464
variables:
6565
PYTORCH_ENABLE_MPS_FALLBACK: 1

environments-and-requirements/environment-win-cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ dependencies:
4444
- git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
4545
- git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
4646
- git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan
47-
- -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
47+
- git+https://github.com/invoke-ai/PyPatchMatch@0.1.4#egg=pypatchmatch
4848
- -e .

0 commit comments

Comments
 (0)