Merge branch 'master' into master

1 files changed, 7 insertions, 1 deletions

diff --git a/webui.py b/webui.py
index aaec79fd..30f3e4a1 100644
--- a/webui.py
+++ b/webui.py
@@ -4,6 +4,7 @@ import time
 import importlib

 import signal

 import re

+import warnings

 from fastapi import FastAPI

 from fastapi.middleware.cors import CORSMiddleware

 from fastapi.middleware.gzip import GZipMiddleware

@@ -17,6 +18,8 @@ from modules import paths, timer, import_hook, errors
 startup_timer = timer.Timer()

 

 import torch

+import pytorch_lightning # pytorch_lightning should be imported after torch, but it re-enables warnings on import so import once to disable them

+warnings.filterwarnings(action="ignore", category=DeprecationWarning, module="pytorch_lightning")

 startup_timer.record("import torch")

 

 import gradio

@@ -240,7 +243,7 @@ def webui():
         shared.demo = modules.ui.create_ui()

         startup_timer.record("create ui")

 

-        if cmd_opts.gradio_queue:

+        if not cmd_opts.no_gradio_queue:

             shared.demo.queue(64)

 

         gradio_auth_creds = []

@@ -262,6 +265,9 @@ def webui():
             inbrowser=cmd_opts.autolaunch,

             prevent_thread_lock=True

         )

+        for dep in shared.demo.dependencies:

+            dep['show_progress'] = False  # disable gradio css animation on component update

+

         # after initial launch, disable --autolaunch for subsequent restarts

         cmd_opts.autolaunch = False