From 374307dd8adb21d65cf5658edc16282df4f229ca Mon Sep 17 00:00:00 2001
From: Disty0 <semihgulec2005@gmail.com>
Date: Tue, 22 Aug 2023 10:39:38 +0300
Subject: [PATCH] Cleanup

---
 modules/intel/openvino/__init__.py | 12 ------------
 modules/shared.py                  |  2 ++
 modules/ui.py                      | 11 +++++++++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/modules/intel/openvino/__init__.py b/modules/intel/openvino/__init__.py
index d31029e3b..8113fe02c 100644
--- a/modules/intel/openvino/__init__.py
+++ b/modules/intel/openvino/__init__.py
@@ -112,15 +112,3 @@ def get_cached_file_name(*args, model_hash_str, device, cache_root):
             file_name = None
             model_hash_str = None
     return file_name
-
-def openvino_override_opts():
-    from modules import shared
-    if not shared.opts.cuda_compile:
-        shared.log.warn("OpenVINO: Enabling Torch Compile")
-        shared.opts.cuda_compile = True
-    if shared.opts.cuda_compile_backend != "openvino_fx":
-        shared.log.warn("OpenVINO: Setting Torch Compiler backend to OpenVINO FX")
-        shared.opts.cuda_compile_backend = "openvino_fx"
-    if shared.opts.sd_backend != "diffusers":
-        shared.log.warn("OpenVINO: Setting backend to Diffusers")
-        shared.opts.sd_backend = "diffusers"
diff --git a/modules/shared.py b/modules/shared.py
index 70da36eea..4e2208961 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -184,6 +184,8 @@ class State:
 
 state = State()
 state.server_start = time.time()
+if not hasattr(cmd_opts, "use_openvino"):
+    cmd_opts.use_openvino = False
 if cmd_opts.use_openvino:
     backend = Backend.DIFFUSERS
     cmd_opts.backend = 'diffusers'
diff --git a/modules/ui.py b/modules/ui.py
index 02e739b27..66aae0096 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -967,8 +967,15 @@ def create_ui(startup_timer = None):
         if cmd_opts.use_directml:
             directml_override_opts()
         if cmd_opts.use_openvino:
-            from modules.intel.openvino import openvino_override_opts
-            openvino_override_opts()
+            if not modules.shared.opts.cuda_compile:
+                modules.shared.log.warn("OpenVINO: Enabling Torch Compile")
+                modules.shared.opts.cuda_compile = True
+            if modules.shared.opts.cuda_compile_backend != "openvino_fx":
+                modules.shared.log.warn("OpenVINO: Setting Torch Compiler backend to OpenVINO FX")
+                modules.shared.opts.cuda_compile_backend = "openvino_fx"
+            if modules.shared.opts.sd_backend != "diffusers":
+                modules.shared.log.warn("OpenVINO: Setting backend to Diffusers")
+                modules.shared.opts.sd_backend = "diffusers"
         try:
             opts.save(modules.shared.config_filename)
             log.info(f'Settings changed: {len(changed)} {changed}')