Merge branch 'master' into compatibility

README.md

@@ -1,7 +1,11 @@
-# Stable Diffusion web UI
-A browser interface based on Gradio library for Stable Diffusion.
+# Stable Diffusion web UI with OpenVINO™ Acceleration
+A browser interface based on Gradio library for Stable Diffusion with OpenVINO™ Acceleration Script.
 
-![](screenshot.png)
+This repo is a fork of [AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui) which includes OpenVINO support through a [custom script](https://github.com/openvinotoolkit/stable-diffusion-webui/blob/master/scripts/openvino_accelerate.py) to run it on Intel CPUs and Intel GPUs.
+
+See wiki page for [Installation-on-Intel-Silicon](https://github.com/openvinotoolkit/stable-diffusion-webui/wiki/Installation-on-Intel-Silicon)
+
+![](screenshot_OpenVINO.png)
 
 ## Features
 [Detailed feature showcase with images](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features):

first-time-runner.bat

@@ -0,0 +1,21 @@
+@echo off
+
+set "filePath=%cd%\webui-user.bat"
+
+
+(
+    echo @echo off
+    echo.  
+    echo set GIT=
+    echo set VENV_DIR=
+    echo set COMMANDLINE_ARGS=--skip-torch-cuda-test --precision full --no-half 
+    echo set PYTORCH_TRACING_MODE=TORCHFX
+    echo.   
+    echo call webui.bat
+
+) > %filepath%
+
+
+call webui-user.bat
+
+pause

modules/launch_utils.py

@@ -308,9 +308,13 @@ def requirements_met(requirements_file):
 
 
 def prepare_environment():
-    torch_index_url = os.environ.get('TORCH_INDEX_URL', "https://download.pytorch.org/whl/cu118")
-    torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.0.1 torchvision==0.15.2 --extra-index-url {torch_index_url}")
-    requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
+    if os.environ.get("USE_OPENVINO") == "1":
+        torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.1.0 torchvision==0.16.0")
+        requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
+    else:
+        torch_index_url = os.environ.get('TORCH_INDEX_URL', "https://download.pytorch.org/whl/cu118")
+        torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.0.1 torchvision==0.15.2 --extra-index-url {torch_index_url}")
+        requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
 
     xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.20')
     clip_package = os.environ.get('CLIP_PACKAGE', "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip")

requirements.txt

@@ -31,4 +31,8 @@ tomesd
 torch
 torchdiffeq
 torchsde
-transformers==4.30.2
+diffusers
+openvino
+invisible-watermark
+transformers
+

requirements_versions.txt

@@ -1,14 +1,15 @@
-GitPython==3.1.32
-Pillow==9.5.0
+GitPython==3.1.37
+Pillow==10.0.1
 accelerate==0.21.0
 basicsr==1.4.2
-blendmodes==2022
+blendmodes==2023
 clean-fid==0.1.35
 einops==0.4.1
 fastapi==0.94.0
 gfpgan==1.3.8
 gradio==3.41.2
 httpcore==0.15
+httpx==0.24.1
 inflection==0.5.1
 jsonmerge==1.8.0
 kornia==0.6.7
@@ -28,5 +29,4 @@ tomesd==0.1.3
 torch
 torchdiffeq==0.2.3
 torchsde==0.2.5
-transformers==4.30.2
-httpx==0.24.1
+transformers==4.30.2

webui-user.bat

@@ -1,8 +1,12 @@
+
 @echo off
 
 set PYTHON=
 set GIT=
 set VENV_DIR=
-set COMMANDLINE_ARGS=
+set COMMANDLINE_ARGS=--skip-torch-cuda-test --precision full --no-half
+set PYTORCH_TRACING_MODE=TORCHFX
+set USE_OPENVINO=1
 
 call webui.bat
+