Merge pull request #1184 from cmdr2/beta

Don't copy bootstrap.bat unnecessarily

CHANGES.md

@@ -21,10 +21,7 @@
 Our focus continues to remain on an easy installation experience, and an easy user-interface. While still remaining pretty powerful, in terms of features and speed.
 
 ### Detailed changelog
-* 2.5.34 - 22 Apr 2023 - Nothing, just keeping this line warm.
-* 2.5.33 - 21 Apr 2023 - Install PyTorch 2.0 on new installations (on Windows and Linux).
 * 2.5.32 - 19 Apr 2023 - Automatically check for black images, and set full-precision if necessary (for attn). This means custom models based on Stable Diffusion v2.1 will just work, without needing special command-line arguments or editing of yaml config files.
-* 2.5.32 - 18 Apr 2023 - Automatic support for AMD graphics cards on Linux. Thanks @DianaNites and @JeLuf.
 * 2.5.31 - 10 Apr 2023 - Reduce VRAM usage while upscaling.
 * 2.5.31 - 6 Apr 2023 - Allow seeds upto `4,294,967,295`. Thanks @ogmaresca.
 * 2.5.31 - 6 Apr 2023 - Buttons to show the previous/next image in the image popup. Thanks @ogmaresca.

NSIS/sdui.nsi

@@ -235,7 +235,7 @@ Section "MainSection" SEC01
   NScurl::http get "https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt" "$INSTDIR\models\stable-diffusion\sd-v1-4.ckpt" /CANCEL /INSIST /END
 
   DetailPrint 'Downloading the GFPGAN model...'
-  NScurl::http get "https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth" "$INSTDIR\models\gfpgan\GFPGANv1.4.pth" /CANCEL /INSIST /END
+  NScurl::http get "https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth" "$INSTDIR\models\gfpgan\GFPGANv1.3.pth" /CANCEL /INSIST /END
 
   DetailPrint 'Downloading the RealESRGAN_x4plus model...'
   NScurl::http get "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth" "$INSTDIR\models\realesrgan\RealESRGAN_x4plus.pth" /CANCEL /INSIST /END

README.md

@@ -1,5 +1,5 @@
 # Easy Diffusion 2.5
-### The easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer.
+### The easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your computer.
 
 Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community.
 

scripts/check_modules.py

@@ -18,7 +18,7 @@ os_name = platform.system()
 modules_to_check = {
     "torch": ("1.11.0", "1.13.1", "2.0.0"),
     "torchvision": ("0.12.0", "0.14.1", "0.15.1"),
-    "sdkit": "1.0.81",
+    "sdkit": "1.0.80",
     "stable-diffusion-sdkit": "2.1.4",
     "rich": "12.6.0",
     "uvicorn": "0.19.0",
@@ -42,17 +42,6 @@ def install(module_name: str, module_version: str):
     if module_name in ("torch", "torchvision"):
         module_version, index_url = apply_torch_install_overrides(module_version)
 
-    if is_amd_on_linux():  # hack until AMD works properly on torch 2.0 (avoids black images on some cards)
-        if module_name == "torch":
-            module_version = "1.13.1+rocm5.2"
-        elif module_name == "torchvision":
-            module_version = "0.14.1+rocm5.2"
-    elif os_name == "Darwin":
-        if module_name == "torch":
-            module_version = "1.13.1"
-        elif module_name == "torchvision":
-            module_version = "0.14.1"
-
     install_cmd = f"python -m pip install --upgrade {module_name}=={module_version}"
     if index_url:
         install_cmd += f" --index-url {index_url}"
@@ -75,10 +64,6 @@ def init():
         if module_name in ("torch", "torchvision"):
             if version(module_name) is None:  # allow any torch version
                 requires_install = True
-            elif os_name == "Darwin" and (  # force mac to downgrade from torch 2.0
-                version("torch").startswith("2.") or version("torchvision").startswith("0.15.")
-            ):
-                requires_install = True
         elif version(module_name) not in allowed_versions:
             requires_install = True
 
@@ -111,7 +96,7 @@ def apply_torch_install_overrides(module_version: str):
         module_version += "+cu117"
         index_url = "https://download.pytorch.org/whl/cu117"
     elif is_amd_on_linux():
-        index_url = "https://download.pytorch.org/whl/rocm5.2"
+        index_url = "https://download.pytorch.org/whl/rocm5.4.2"
 
     return module_version, index_url
 

ui/easydiffusion/task_manager.py

@@ -317,9 +317,6 @@ def thread_render(device):
             def step_callback():
                 global current_state_error
 
-                task_cache.keep(id(task), TASK_TTL)
-                session_cache.keep(task.task_data.session_id, TASK_TTL)
-
                 if (
                     isinstance(current_state_error, SystemExit)
                     or isinstance(current_state_error, StopAsyncIteration)

ui/index.html

@@ -30,7 +30,7 @@
             <h1>
                 <img id="logo_img" src="/media/images/icon-512x512.png" >
                 Easy Diffusion
-                <small>v2.5.34 <span id="updateBranchLabel"></span></small>
+                <small>v2.5.33 <span id="updateBranchLabel"></span></small>
             </h1>
         </div>
         <div id="server-status">