Merge branch 'main' into beta

scripts/on_sd_start.bat

@@ -18,6 +18,7 @@
     @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
 
     @call git apply ..\ui\sd_internal\ddim_callback.patch
+    @call git apply ..\ui\sd_internal\env_yaml.patch
 
     @cd ..
 ) else (
@@ -35,6 +36,7 @@
     @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
 
     @call git apply ..\ui\sd_internal\ddim_callback.patch
+    @call git apply ..\ui\sd_internal\env_yaml.patch
 
     @cd ..
 )

scripts/on_sd_start.sh

@@ -19,6 +19,7 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta
     git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
 
     git apply ../ui/sd_internal/ddim_callback.patch
+    git apply ../ui/sd_internal/env_yaml.patch
 
     cd ..
 else
@@ -36,6 +37,7 @@ else
     git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
 
     git apply ../ui/sd_internal/ddim_callback.patch
+    git apply ../ui/sd_internal/env_yaml.patch
 
     cd ..
 fi

ui/sd_internal/env_yaml.patch

@@ -0,0 +1,13 @@
+diff --git a/environment.yaml b/environment.yaml
+index 7f25da8..306750f 100644
+--- a/environment.yaml
++++ b/environment.yaml
+@@ -23,6 +23,8 @@ dependencies:
+     - torch-fidelity==0.3.0
+     - transformers==4.19.2
+     - torchmetrics==0.6.0
++    - pywavelets==1.3.0
++    - pandas==1.4.4
+     - kornia==0.6
+     - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
+     - -e git+https://github.com/openai/CLIP.git@main#egg=clip