Merge remote-tracking branch 'origin/main' into dev/diffusers

# Conflicts:
#	ldm/invoke/generator/img2img.py

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 "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!
 
 
-
-

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 .

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 .

environments-and-requirements/environment-lin-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.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 .

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

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 .

source_installer/invoke.bat.in

@@ -1,5 +1,8 @@
 @echo off
 
+REM  isolate changes to environment variables so that this can be run again with restarting a cmd session
+setlocal
+
 PUSHD "%~dp0"
 set INSTALL_ENV_DIR=%cd%\installer_files\env
 set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH%
@@ -28,3 +31,4 @@ IF /I "%restore%" == "1" (
     pause
     exit /b
 )
+endlocal