fix basicsr conflict on windows

binary_installer/create_installers.sh

@@ -6,6 +6,8 @@ IFS=$'\n\t'
 echo "Be certain that you're in the 'installer' directory before continuing."
 read -p "Press any key to continue, or CTRL-C to exit..."
 
+VERSION='2.2.3'
+
 # make the installer zip for linux and mac
 rm -rf InvokeAI
 mkdir -p InvokeAI
@@ -13,8 +15,8 @@ cp install.sh.in InvokeAI/install.sh
 chmod a+x InvokeAI/install.sh
 cp readme.txt InvokeAI
 
-zip -r InvokeAI-binary-linux.zip InvokeAI
-zip -r InvokeAI-binary-mac.zip InvokeAI
+zip -r InvokeAI-binary-$VERSION-linux.zip InvokeAI
+zip -r InvokeAI-binary-$VERSION-mac.zip InvokeAI
 
 # make the installer zip for windows
 rm -rf InvokeAI
@@ -23,7 +25,7 @@ cp install.bat.in InvokeAI/install.bat
 cp readme.txt InvokeAI
 cp WinLongPathsEnabled.reg InvokeAI
 
-zip -r InvokeAI-binary-windows.zip InvokeAI
+zip -r InvokeAI-binary-$VERSION-windows.zip InvokeAI
 
 rm -rf InvokeAI
 

binary_installer/install.sh.in

@@ -213,7 +213,8 @@ _err_exit $? _err_msg
 
 echo -e "\n***** Installed InvokeAI *****\n"
 
-cp binary_installer/invoke.sh .
+cp binary_installer/invoke.sh.in ./invoke.sh
+chmod a+rx ./invoke.sh
 echo -e "\n***** Installed invoke launcher script ******\n"
 
 # more cleanup

binary_installer/py3.10-linux-x86_64-cuda-reqs.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file=binary_installer/py3.10-linux-x86_64-cuda-reqs.txt binary_installer/requirements.in
 #
@@ -418,8 +418,8 @@ getpass-asterisk==1.0.1 \
     --hash=sha256:20d45cafda0066d761961e0919728526baf7bb5151fbf48a7d5ea4034127d857 \
     --hash=sha256:7cc357a924cf62fa4e15b73cb4e5e30685c9084e464ffdc3fd9000a2b54ea9e9
     # via -r binary_installer/requirements.in
-gfpgan @ https://github.com/TencentARC/GFPGAN/archive/2eac2033893ca7f427f4035d80fe95b92649ac56.zip \
-    --hash=sha256:79e6d71c8f1df7c7ccb0ac6b9a2ccb615ad5cde818c8b6f285a8711c05aebf85
+gfpgan @ https://github.com/invoke-ai/GFPGAN/archive/c796277a1cf77954e5fc0b288d7062d162894248.zip ; platform_system == "Linux" or platform_system == "Darwin" \
+    --hash=sha256:4155907b8b7db3686324554df7007eedd245cdf8656c21da9d9a3f44bef2fcaa
     # via
     #   -r binary_installer/requirements.in
     #   realesrgan

binary_installer/requirements.in

@@ -26,6 +26,7 @@ transformers
 picklescan
 https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip
 https://github.com/invoke-ai/clipseg/archive/1f754751c85d7d4255fa681f4491ff5711c1c288.zip
-https://github.com/TencentARC/GFPGAN/archive/2eac2033893ca7f427f4035d80fe95b92649ac56.zip
+https://github.com/invoke-ai/GFPGAN/archive/3f5d2397361199bc4a91c08bb7d80f04d7805615.zip ; platform_system=='Windows'
+https://github.com/invoke-ai/GFPGAN/archive/c796277a1cf77954e5fc0b288d7062d162894248.zip ; platform_system=='Linux' or platform_system=='Darwin'
 https://github.com/Birch-san/k-diffusion/archive/363386981fee88620709cf8f6f2eea167bd6cd74.zip
 https://github.com/invoke-ai/PyPatchMatch/archive/129863937a8ab37f6bbcec327c994c0f932abdbc.zip

docs/installation/index.md

@@ -5,31 +5,7 @@ title: Overview
 We offer several ways to install InvokeAI, each one suited to your
 experience and preferences.
 
-1. [InvokeAI binary installer](INSTALL_INVOKE.md)
-
-    This is a installer script that installs InvokeAI and all the
-    third party libraries it depends on. It includes access to a
-    "developer console" which will help us debug problems with you and
-    give you to access experimental features.
-
-    When a new InvokeAI release is available, you will run an `update`
-    script to download and install the new version. Intermediate versions
-    that contain experimental and possibly unstable features will not be
-    available.
-
-    This installer is designed for people who want the system to "just
-    work", don't have an interest in tinkering with it, and do not
-    care about upgrading to unreleased experimental features.
-
-    **Important Caveats**
-    - This script does not support AMD GPUs. For Linux AMD support,
-    please use the manual or source code installer methods.
-    - The tab autocomplete feature of the command-line client,
-    which completes commonly used filenames and commands, will
-    not work in this version. All Web UI functions are fully
-    operational, however.
-
-2. [InvokeAI source code installer](INSTALL_SOURCE.md)
+1. [InvokeAI source code installer](INSTALL_SOURCE.md)
 
     This is a script that will install Python, the Anaconda ("conda")
     package manager, all of InvokeAI's its essential third party
@@ -46,8 +22,7 @@ experience and preferences.
     **Important Caveats**
     - This script is a bit cranky and occasionally hangs or times out,
     forcing you to cancel and restart the script (it will pick up where
-    it left off). It also takes noticeably longer to run than the
-    binary installer.
+    it left off).
 
 2. [Manual Installation](INSTALL_MANUAL.md)
 

source_installer/create_installers.sh

@@ -2,6 +2,8 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
+VERSION='2.2.3'
+
 # make the installer zip for linux and mac
 rm -rf invokeAI
 mkdir -p invokeAI
@@ -9,8 +11,8 @@ cp install.sh.in invokeAI/install.sh
 chmod a+x invokeAI/install.sh
 cp readme.txt invokeAI
 
-zip -r invokeAI-src-installer-linux.zip invokeAI
-zip -r invokeAI-src-installer-mac.zip invokeAI
+zip -r invokeAI-src-installer-$VERSION-linux.zip invokeAI
+zip -r invokeAI-src-installer-$VERSION-mac.zip invokeAI
 
 # make the installer zip for windows
 rm -rf invokeAI
@@ -19,7 +21,7 @@ cp install.bat.in invokeAI/install.bat
 cp readme.txt invokeAI
 cp WinLongPathsEnabled.reg invokeAI
 
-zip -r invokeAI-src-installer-windows.zip invokeAI
+zip -r invokeAI-src-installer-$VERSION-windows.zip invokeAI
 
 rm -rf invokeAI
 echo "The installer zips are ready to be distributed.."

source_installer/install.sh.in

@@ -123,6 +123,8 @@ then
 else
     ln -sf ./source_installer/invoke.sh.in ./invoke.sh
     ln -sf ./source_installer/update.sh.in ./update.sh
+    chmod a+rx ./source_installer/invoke.sh.in
+    chmod a+rx ./source_installer/update.sh.in
 
     conda activate invokeai
     # configure