Merge branch 'development' into dev/diffusers

Author: keturn

.github/workflows/test-invoke-conda.yml

@@ -4,7 +4,6 @@ on:
     branches:
       - 'main'
       - 'development'
-      - 'fix-gh-actions-fork'
   pull_request:
     branches:
       - 'main'

environment-linux-aarch64.yml

@@ -2,15 +2,16 @@ name: invokeai
 channels:
   - pytorch
   - conda-forge
+  - defaults
 dependencies:
-  - python=3.9.*
+  - python=3.10
   - pip>=22.2.2
   - cudatoolkit
   - pytorch
   - torchvision
-  - numpy=1.19
-  - imageio=2.9.0
-  - opencv=4.6.0
+  - numpy=1.23
+  - imageio=2.21
+  - opencv=4.6
   - pillow=8.*
   - flask=2.1.*
   - flask_cors=3.0.10
@@ -25,21 +26,18 @@ dependencies:
   - einops=0.3.0
   - kornia=0.6
   - torchmetrics=0.7.0
-  - transformers=4.21.3
+  - transformers=4.23
   - torch-fidelity=0.3.0
   - tokenizers>=0.11.1,!=0.11.3,<0.13
   - pip:
       - getpass_asterisk
       - omegaconf==2.1.1
-      - realesrgan==0.2.5.0
-      - test-tube>=0.7.5
       - pyreadline3
-      - dependency_injector==4.40.0
-      - -e git+https://github.com/openai/CLIP.git@main#egg=clip
-      - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
-      - -e git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
-      - -e git+https://github.com/TencentARC/GFPGAN.git#egg=gfpgan
-      - -e git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg
+      - taming-transformers-rom1504
+      - test-tube>=0.7.5
+      - git+https://github.com/openai/CLIP.git@main#egg=clip
+      - git+https://github.com/invoke-ai/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@models-rename#egg=clipseg
       - -e .
-variables:
-  PYTORCH_ENABLE_MPS_FALLBACK: 1

environment-mac.yml

@@ -2,12 +2,15 @@ name: invokeai
 channels:
   - pytorch
   - conda-forge
+  - defaults
 dependencies:
-  - python=3.9.13
-  - pip=22.2.2
-
-  - pytorch=1.12.1
-  - torchvision=0.13.1
+  - python=3.10
+  - pip>=22.2
+  - pytorch=1.12
+  - pytorch-lightning=1.7
+  - torchvision=0.13
+  - torchmetrics=0.10
+  - torch-fidelity=0.3
 
   # I suggest to keep the other deps sorted for convenience.
   # To determine what the latest versions should be, run:
@@ -17,49 +20,45 @@ dependencies:
   # CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac-updated.yml && conda list -n invokeai-updated | awk ' {print "  - " $1 "==" $2;} '
   # ```
 
-  - albumentations=1.2.1
-  - coloredlogs=15.0.1
-  - diffusers=0.6.0
-  - einops=0.4.1
-  - grpcio=1.46.4
+  - albumentations=1.2
+  - coloredlogs=15.0
+  - diffusers=0.6
+  - einops=0.3
+  - eventlet
+  - grpcio=1.46
+  - flask=2.1
+  - flask-socketio=5.3
+  - flask-cors=3.0
   - humanfriendly=10.0
-  - imageio=2.21.2
-  - imageio-ffmpeg=0.4.7
-  - imgaug=0.4.0
-  - kornia=0.6.7
-  - mpmath=1.2.1
-  - nomkl # arm64 has only 1.0 while x64 needs 3.0
-  - numpy=1.23.4
-  - omegaconf=2.1.1
-  - openh264=2.3.0
-  - onnx=1.12.0
-  - onnxruntime=1.12.1
-  - pudb=2022.1
-  - pytorch-lightning=1.7.7
-  - scipy=1.9.3
-  - streamlit=1.12.2
-  - sympy=1.10.1
-  - tensorboard=2.10.0
-  - torchmetrics=0.10.1
-  - py-opencv=4.6.0
-  - flask=2.1.3
-  - flask-socketio=5.3.0
-  - flask-cors=3.0.10
-  - eventlet=0.33.1
-  - protobuf=3.20.1
-  - send2trash=1.8.0
-  - transformers=4.23.1
-  - torch-fidelity=0.3.0
+  - imageio=2.21
+  - imageio-ffmpeg=0.4
+  - imgaug=0.4
+  - kornia=0.6
+  - mpmath=1.2
+  - nomkl=3
+  - numpy=1.23
+  - omegaconf=2.1
+  - openh264=2.3
+  - onnx=1.12
+  - onnxruntime=1.12
+  - pudb=2019.2
+  - protobuf=3.20
+  - py-opencv=4.6
+  - scipy=1.9
+  - streamlit=1.12
+  - sympy=1.10
+  - send2trash=1.8
+  - tensorboard=2.10
+  - transformers=4.23
   - pip:
       - getpass_asterisk
-      - dependency_injector==4.40.0
-      - realesrgan==0.2.5.0
+      - taming-transformers-rom1504
       - test-tube==0.7.5
-      - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
-      - -e git+https://github.com/openai/CLIP.git@main#egg=clip
-      - -e git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
-      - -e git+https://github.com/TencentARC/GFPGAN.git#egg=gfpgan
-      - -e git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg
+      - git+https://github.com/openai/CLIP.git@main#egg=clip
+      - git+https://github.com/invoke-ai/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@models-rename#egg=clipseg
       - -e .
 variables:
   PYTORCH_ENABLE_MPS_FALLBACK: 1

environment.yml

@@ -4,7 +4,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python>=3.9
+  - python=3.10
   - pip=22.2.2
   - numpy=1.23.3
   - torchvision=0.13.1
@@ -33,14 +33,13 @@ dependencies:
     - flask==2.1.3
     - flask_socketio==5.3.0
     - flask_cors==3.0.10
-    - dependency_injector==4.40.0
     - eventlet
     - getpass_asterisk
     - kornia==0.6.0
+    - taming-transformers-rom1504
     - git+https://github.com/openai/CLIP.git@main#egg=clip
-    - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
-    - -e git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
-    - -e git+https://github.com/invoke-ai/Real-ESRGAN.git#egg=realesrgan
-    - -e git+https://github.com/invoke-ai/GFPGAN.git#egg=gfpgan
-    - -e git+https://github.com/invoke-ai/clipseg.git@models-rename#egg=clipseg
+    - git+https://github.com/invoke-ai/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@models-rename#egg=clipseg
     - -e .