From f9718f068cae9bab3f7ee080cac056d6c43e705b Mon Sep 17 00:00:00 2001 From: Disty0 Date: Sat, 19 Aug 2023 17:52:15 +0300 Subject: [PATCH] Seperate OpenVINO from IPEX --- installer.py | 6 ++++-- modules/devices.py | 2 +- modules/{ipex_specific => intel/ipex}/__init__.py | 4 ---- modules/{ipex_specific => intel/ipex}/diffusers.py | 0 modules/{ipex_specific => intel/ipex}/hijacks.py | 2 +- .../openvino.py => intel/openvino/__init__.py} | 1 - modules/sd_hijack.py | 2 ++ modules/sd_models.py | 9 +++++++-- 8 files changed, 15 insertions(+), 11 deletions(-) rename modules/{ipex_specific => intel/ipex}/__init__.py (98%) rename modules/{ipex_specific => intel/ipex}/diffusers.py (100%) rename modules/{ipex_specific => intel/ipex}/hijacks.py (99%) rename modules/{ipex_specific/openvino.py => intel/openvino/__init__.py} (95%) diff --git a/installer.py b/installer.py index ec61487c7..e8d501091 100644 --- a/installer.py +++ b/installer.py @@ -399,10 +399,10 @@ def check_torch(): os.environ.setdefault('NEOReadDebugKeys', '1') os.environ.setdefault('ClDeviceGlobalMemSizeAvailablePercent', '100') if "linux" in sys.platform: - torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.1a0 torchvision==0.15.2a0 intel_extension_for_pytorch==2.0.110+xpu openvino==2023.1.0.dev20230811 -f https://developer.intel.com/ipex-whl-stable-xpu') + torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.1a0 torchvision==0.15.2a0 intel_extension_for_pytorch==2.0.110+xpu -f https://developer.intel.com/ipex-whl-stable-xpu') os.environ.setdefault('TENSORFLOW_PACKAGE', 'tensorflow==2.13.0 intel-extension-for-tensorflow[gpu]') else: - torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.0a0 intel_extension_for_pytorch==2.0.110+gitba7f6c1 openvino==2023.1.0.dev20230811 -f https://developer.intel.com/ipex-whl-stable-xpu') + torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.0a0 intel_extension_for_pytorch==2.0.110+gitba7f6c1 -f https://developer.intel.com/ipex-whl-stable-xpu') else: machine = platform.machine() if sys.platform == 'darwin': @@ -467,6 +467,8 @@ def check_torch(): log.debug(f'Cannot install xformers package: {e}') if opts.get('cuda_compile_backend', '') == 'hidet': install('hidet', 'hidet') + if opts.get('cuda_compile_backend', '') == 'openvino_fx': + install('openvino==2023.1.0.dev20230811', 'openvino') if args.profile: print_profile(pr, 'Torch') diff --git a/modules/devices.py b/modules/devices.py index 533e4d4ad..8647105ac 100644 --- a/modules/devices.py +++ b/modules/devices.py @@ -167,7 +167,7 @@ def set_cuda_params(): args = cmd_args.parser.parse_args() if args.use_ipex or (hasattr(torch, 'xpu') and torch.xpu.is_available()): backend = 'ipex' - from modules.ipex_specific import ipex_init + from modules.intel.ipex import ipex_init ipex_init() elif args.use_directml: backend = 'directml' diff --git a/modules/ipex_specific/__init__.py b/modules/intel/ipex/__init__.py similarity index 98% rename from modules/ipex_specific/__init__.py rename to modules/intel/ipex/__init__.py index bd3695710..4acf9e4df 100644 --- a/modules/ipex_specific/__init__.py +++ b/modules/intel/ipex/__init__.py @@ -163,7 +163,3 @@ def ipex_init(): ipex_hijacks() ipex_diffusers() - try: - from .openvino import openvino_fx - except Exception: - pass diff --git a/modules/ipex_specific/diffusers.py b/modules/intel/ipex/diffusers.py similarity index 100% rename from modules/ipex_specific/diffusers.py rename to modules/intel/ipex/diffusers.py diff --git a/modules/ipex_specific/hijacks.py b/modules/intel/ipex/hijacks.py similarity index 99% rename from modules/ipex_specific/hijacks.py rename to modules/intel/ipex/hijacks.py index 32902c5a0..a31c88124 100644 --- a/modules/ipex_specific/hijacks.py +++ b/modules/intel/ipex/hijacks.py @@ -11,7 +11,7 @@ def ipex_no_cuda(orig_func, *args, **kwargs): # pylint: disable=redefined-outer- #Autocast original_autocast = torch.autocast def ipex_autocast(*args, **kwargs): - if args[0] == "cuda": + if args[0] == "cuda" or args[0] == "xpu": if "dtype" in kwargs: return original_autocast("xpu", *args[1:], **kwargs) else: diff --git a/modules/ipex_specific/openvino.py b/modules/intel/openvino/__init__.py similarity index 95% rename from modules/ipex_specific/openvino.py rename to modules/intel/openvino/__init__.py index 9674ae5a4..84df9d596 100644 --- a/modules/ipex_specific/openvino.py +++ b/modules/intel/openvino/__init__.py @@ -1,6 +1,5 @@ import os import torch -import intel_extension_for_pytorch as ipex from openvino.frontend.pytorch.torchdynamo.execute import execute from openvino.frontend.pytorch.torchdynamo.partition import Partitioner from torch._dynamo.backends.common import fake_tensor_unsupported diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index a583d79d8..04af28a32 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -188,6 +188,8 @@ class StableDiffusionModelHijack: import logging shared.log.info(f"Compiling pipeline={m.model.__class__.__name__} mode={opts.cuda_compile_backend}") import torch._dynamo # pylint: disable=unused-import,redefined-outer-name + if shared.opts.cuda_compile_backend == "openvino_fx": + from modules.intel.openvino import openvino_fx log_level = logging.WARNING if opts.cuda_compile_verbose else logging.CRITICAL # pylint: disable=protected-access if hasattr(torch, '_logging'): torch._logging.set_logs(dynamo=log_level, aot=log_level, inductor=log_level) # pylint: disable=protected-access diff --git a/modules/sd_models.py b/modules/sd_models.py index 03325d4a9..88ad81559 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -749,7 +749,7 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No sd_model.unet.to(memory_format=torch.channels_last) base_sent_to_cpu=False - if (shared.opts.cuda_compile or shared.opts.ipex_optimize) and torch.cuda.is_available(): + if (shared.opts.cuda_compile and shared.opts.cuda_compile_backend != 'none') or shared.opts.ipex_optimize: if op == 'refiner' and not sd_model.has_accelerate: gpu_vram = memory_stats().get('gpu', {}) free_vram = gpu_vram.get('total', 0) - gpu_vram.get('used', 0) @@ -774,20 +774,25 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No try: if shared.opts.ipex_optimize: sd_model.unet.training = False + sd_model.vae.training = False sd_model.unet = torch.xpu.optimize(sd_model.unet, dtype=devices.dtype_unet, inplace=True, weights_prepack=False) # pylint: disable=attribute-defined-outside-init + sd_model.vae = torch.xpu.optimize(sd_model.vae, dtype=devices.dtype_unet, inplace=True, weights_prepack=False) # pylint: disable=attribute-defined-outside-init shared.log.info("Applied IPEX Optimize.") except Exception as err: shared.log.warning(f"IPEX Optimize not supported: {err}") try: - if shared.opts.cuda_compile: + if shared.opts.cuda_compile and shared.opts.cuda_compile_backend != 'none': shared.log.info(f"Compiling pipeline={sd_model.__class__.__name__} shape={8 * sd_model.unet.config.sample_size} mode={shared.opts.cuda_compile_backend}") import torch._dynamo # pylint: disable=unused-import,redefined-outer-name + if shared.opts.cuda_compile_backend == "openvino_fx": + from modules.intel.openvino import openvino_fx log_level = logging.WARNING if shared.opts.cuda_compile_verbose else logging.CRITICAL # pylint: disable=protected-access if hasattr(torch, '_logging'): torch._logging.set_logs(dynamo=log_level, aot=log_level, inductor=log_level) # pylint: disable=protected-access torch._dynamo.config.verbose = shared.opts.cuda_compile_verbose # pylint: disable=protected-access torch._dynamo.config.suppress_errors = shared.opts.cuda_compile_errors # pylint: disable=protected-access sd_model.unet = torch.compile(sd_model.unet, mode=shared.opts.cuda_compile_mode, backend=shared.opts.cuda_compile_backend, fullgraph=shared.opts.cuda_compile_fullgraph) # pylint: disable=attribute-defined-outside-init + sd_model.vae.decode = torch.compile(sd_model.vae.decode, mode=shared.opts.cuda_compile_mode, backend=shared.opts.cuda_compile_backend, fullgraph=shared.opts.cuda_compile_fullgraph) # pylint: disable=attribute-defined-outside-init sd_model("dummy prompt") shared.log.info("Complilation done.") except Exception as err: