diff --git a/modules/api/api.py b/modules/api/api.py index fa8110469..28ccff02f 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -583,7 +583,6 @@ class Api: try: import torch if shared.cmd_opts.use_ipex(): - import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import system = { 'free': (torch.xpu.get_device_properties("xpu").total_memory - torch.xpu.memory_allocated()), 'used': torch.xpu.memory_allocated(), 'total': torch.xpu.get_device_properties("xpu").total_memory } s = dict(torch.xpu.memory_stats("xpu")) allocated = { 'current': s['allocated_bytes.all.current'], 'peak': s['allocated_bytes.all.peak'] } diff --git a/modules/codeformer/codeformer_arch.py b/modules/codeformer/codeformer_arch.py index 6d7b926fe..11dcc3ee7 100644 --- a/modules/codeformer/codeformer_arch.py +++ b/modules/codeformer/codeformer_arch.py @@ -3,10 +3,6 @@ import math import numpy as np import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from torch import nn, Tensor import torch.nn.functional as F from typing import Optional, List diff --git a/modules/codeformer/vqgan_arch.py b/modules/codeformer/vqgan_arch.py index e66bb2a72..e72936838 100644 --- a/modules/codeformer/vqgan_arch.py +++ b/modules/codeformer/vqgan_arch.py @@ -7,10 +7,6 @@ https://github.com/samb-t/unleashing-transformers/blob/master/models/vqgan.py ''' import numpy as np import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import torch.nn as nn import torch.nn.functional as F import copy diff --git a/modules/codeformer_model.py b/modules/codeformer_model.py index 9d75e823d..c2b0689ba 100644 --- a/modules/codeformer_model.py +++ b/modules/codeformer_model.py @@ -3,10 +3,6 @@ import sys import cv2 import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import modules.face_restoration from modules import shared, devices, modelloader, errors diff --git a/modules/deepbooru.py b/modules/deepbooru.py index 50e400fd8..1c4554a20 100644 --- a/modules/deepbooru.py +++ b/modules/deepbooru.py @@ -2,10 +2,6 @@ import os import re import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import numpy as np from modules import modelloader, paths, deepbooru_model, devices, images, shared diff --git a/modules/deepbooru_model.py b/modules/deepbooru_model.py index ef53494a2..c2c77cd25 100644 --- a/modules/deepbooru_model.py +++ b/modules/deepbooru_model.py @@ -1,8 +1,4 @@ import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import torch.nn as nn import torch.nn.functional as F diff --git a/modules/devices.py b/modules/devices.py index 529f75152..40dc6548d 100644 --- a/modules/devices.py +++ b/modules/devices.py @@ -2,10 +2,6 @@ import sys import contextlib import torch from modules import cmd_args, shared -try: - import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import -except: - pass if sys.platform == "darwin": from modules import mac_specific # pylint: disable=ungrouped-imports diff --git a/modules/esrgan_model.py b/modules/esrgan_model.py index 769d66f01..bb4c6619b 100644 --- a/modules/esrgan_model.py +++ b/modules/esrgan_model.py @@ -2,10 +2,6 @@ import os import numpy as np import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from PIL import Image from basicsr.utils.download_util import load_file_from_url diff --git a/modules/esrgan_model_arch.py b/modules/esrgan_model_arch.py index fc352d0ba..411d98d38 100644 --- a/modules/esrgan_model_arch.py +++ b/modules/esrgan_model_arch.py @@ -2,10 +2,6 @@ import math import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import torch.nn as nn import torch.nn.functional as F diff --git a/modules/extras.py b/modules/extras.py index df0def4fd..76f74b248 100644 --- a/modules/extras.py +++ b/modules/extras.py @@ -4,10 +4,6 @@ import html import shutil import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import -except: - pass import tqdm import gradio as gr import safetensors.torch diff --git a/modules/hypernetworks/hypernetwork.py b/modules/hypernetworks/hypernetwork.py index a1caecbe4..9500c0410 100644 --- a/modules/hypernetworks/hypernetwork.py +++ b/modules/hypernetworks/hypernetwork.py @@ -8,10 +8,6 @@ import inspect import modules.textual_inversion.dataset import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import tqdm from einops import rearrange, repeat from ldm.util import default diff --git a/modules/interrogate.py b/modules/interrogate.py index 9892d326f..38956a8aa 100644 --- a/modules/interrogate.py +++ b/modules/interrogate.py @@ -5,10 +5,6 @@ from pathlib import Path import re import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=unused-import,import-error -except: - pass import torch.hub # pylint: disable=ungrouped-imports from torchvision import transforms diff --git a/modules/lowvram.py b/modules/lowvram.py index 7dba01593..e254cc131 100644 --- a/modules/lowvram.py +++ b/modules/lowvram.py @@ -1,8 +1,4 @@ import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from modules import devices module_in_gpu = None diff --git a/modules/mac_specific.py b/modules/mac_specific.py index 4c5efa544..9e3d13243 100644 --- a/modules/mac_specific.py +++ b/modules/mac_specific.py @@ -1,10 +1,6 @@ import platform from packaging import version import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import -except: - pass from modules.sd_hijack_utils import CondFunc diff --git a/modules/memmon.py b/modules/memmon.py index c9d7131ef..66bf0303c 100644 --- a/modules/memmon.py +++ b/modules/memmon.py @@ -2,11 +2,6 @@ import threading import time from collections import defaultdict import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=unused-import,import-error -except: - pass - from modules import shared diff --git a/modules/models/diffusion/ddpm_edit.py b/modules/models/diffusion/ddpm_edit.py index 846a74fc4..f3d49c44c 100644 --- a/modules/models/diffusion/ddpm_edit.py +++ b/modules/models/diffusion/ddpm_edit.py @@ -10,10 +10,6 @@ https://github.com/CompVis/taming-transformers # See more details in LICENSE. import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import torch.nn as nn import numpy as np import pytorch_lightning as pl diff --git a/modules/models/diffusion/uni_pc/sampler.py b/modules/models/diffusion/uni_pc/sampler.py index e3f8a6651..e46befd06 100644 --- a/modules/models/diffusion/uni_pc/sampler.py +++ b/modules/models/diffusion/uni_pc/sampler.py @@ -2,10 +2,6 @@ import numpy as np import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from .uni_pc import NoiseScheduleVP, model_wrapper, UniPC, get_time_steps from modules import shared, devices diff --git a/modules/models/diffusion/uni_pc/uni_pc.py b/modules/models/diffusion/uni_pc/uni_pc.py index d86572f69..fc78bd42d 100644 --- a/modules/models/diffusion/uni_pc/uni_pc.py +++ b/modules/models/diffusion/uni_pc/uni_pc.py @@ -1,8 +1,4 @@ import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import torch.nn.functional as F import math import time diff --git a/modules/processing.py b/modules/processing.py index b8beaf314..2ba6bd3ed 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -5,10 +5,6 @@ import random import logging from typing import Any, Dict, List import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import -except: - pass import numpy as np from PIL import Image, ImageFilter, ImageOps import cv2 diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py index 6722d9f80..7006f2822 100644 --- a/modules/prompt_parser.py +++ b/modules/prompt_parser.py @@ -368,7 +368,3 @@ if __name__ == "__main__": doctest.testmod(optionflags=doctest.NORMALIZE_WHITESPACE) else: import torch # doctest faster - try: - import intel_extension_for_pytorch as ipex - except: - pass diff --git a/modules/safe.py b/modules/safe.py index 3a4aec4d7..483b85a90 100644 --- a/modules/safe.py +++ b/modules/safe.py @@ -6,10 +6,6 @@ import zipfile import re import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import -except: - pass import numpy import _codecs diff --git a/modules/sd_disable_initialization.py b/modules/sd_disable_initialization.py index 5cc5e4e7a..c4a09d15d 100644 --- a/modules/sd_disable_initialization.py +++ b/modules/sd_disable_initialization.py @@ -1,10 +1,6 @@ import ldm.modules.encoders.modules import open_clip import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import transformers.utils.hub diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index e06692213..29475e1ed 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -1,9 +1,5 @@ from types import MethodType import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=unused-import -except: - pass from torch.nn.functional import silu import ldm.modules.attention import ldm.modules.diffusionmodules.model diff --git a/modules/sd_hijack_clip.py b/modules/sd_hijack_clip.py index cf4abf84f..945f7732d 100644 --- a/modules/sd_hijack_clip.py +++ b/modules/sd_hijack_clip.py @@ -2,10 +2,6 @@ import math from collections import namedtuple import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from modules import prompt_parser, devices, sd_hijack from modules.shared import opts diff --git a/modules/sd_hijack_inpainting.py b/modules/sd_hijack_inpainting.py index 1a9ea9b4c..4b23c132d 100644 --- a/modules/sd_hijack_inpainting.py +++ b/modules/sd_hijack_inpainting.py @@ -1,8 +1,4 @@ import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import ldm.models.diffusion.ddpm import ldm.models.diffusion.ddim diff --git a/modules/sd_hijack_open_clip.py b/modules/sd_hijack_open_clip.py index c0c204a82..f76fc1f3b 100644 --- a/modules/sd_hijack_open_clip.py +++ b/modules/sd_hijack_open_clip.py @@ -1,9 +1,5 @@ import open_clip.tokenizer import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from modules import sd_hijack_clip, devices diff --git a/modules/sd_hijack_optimizations.py b/modules/sd_hijack_optimizations.py index f4c89acc3..a79bf6ae0 100644 --- a/modules/sd_hijack_optimizations.py +++ b/modules/sd_hijack_optimizations.py @@ -2,10 +2,6 @@ import math import psutil import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=unused-import,import-error -except: - pass from torch import einsum from ldm.util import default diff --git a/modules/sd_hijack_unet.py b/modules/sd_hijack_unet.py index ce6ac1306..7ff553ae3 100644 --- a/modules/sd_hijack_unet.py +++ b/modules/sd_hijack_unet.py @@ -1,8 +1,4 @@ import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from packaging import version from modules import devices diff --git a/modules/sd_hijack_xlmr.py b/modules/sd_hijack_xlmr.py index a9cb9454c..28528329b 100644 --- a/modules/sd_hijack_xlmr.py +++ b/modules/sd_hijack_xlmr.py @@ -1,8 +1,4 @@ import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from modules import sd_hijack_clip, devices diff --git a/modules/sd_models.py b/modules/sd_models.py index a2615afd2..f422b0133 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -7,10 +7,6 @@ from os import mkdir from urllib import request from rich import progress # pylint: disable=redefined-builtin import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import -except: - pass import safetensors.torch from omegaconf import OmegaConf import tomesd diff --git a/modules/sd_models_config.py b/modules/sd_models_config.py index 5bc3799a0..a9c515b14 100644 --- a/modules/sd_models_config.py +++ b/modules/sd_models_config.py @@ -1,10 +1,6 @@ import os import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from modules import paths, sd_disable_initialization diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py index dfb478251..888f9a30e 100644 --- a/modules/sd_samplers_common.py +++ b/modules/sd_samplers_common.py @@ -1,10 +1,6 @@ from collections import namedtuple import numpy as np import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from PIL import Image from modules import devices, processing, images, sd_vae_approx diff --git a/modules/sd_samplers_compvis.py b/modules/sd_samplers_compvis.py index 6f08a9022..8de719323 100644 --- a/modules/sd_samplers_compvis.py +++ b/modules/sd_samplers_compvis.py @@ -4,10 +4,6 @@ import ldm.models.diffusion.plms import numpy as np import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from modules.shared import state from modules import sd_samplers_common, prompt_parser, shared diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py index 5ba34cc33..a30d351fc 100644 --- a/modules/sd_samplers_kdiffusion.py +++ b/modules/sd_samplers_kdiffusion.py @@ -1,10 +1,6 @@ from collections import deque import inspect import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import k_diffusion.sampling from modules import prompt_parser, devices, sd_samplers_common diff --git a/modules/sd_vae.py b/modules/sd_vae.py index bc5820b70..27bfb070d 100644 --- a/modules/sd_vae.py +++ b/modules/sd_vae.py @@ -4,11 +4,6 @@ import glob from copy import deepcopy import torch from modules import shared, paths, devices, script_callbacks, sd_models -try: - import intel_extension_for_pytorch as ipex # pylint: disable=unused-import -except: - if shared.cmd_opts.use_ipex: - shared.log.error("Failed to import IPEX") vae_ignore_keys = {"model_ema.decay", "model_ema.num_updates"} vae_dict = {} diff --git a/modules/sd_vae_approx.py b/modules/sd_vae_approx.py index 56c3fb15f..e2f004683 100644 --- a/modules/sd_vae_approx.py +++ b/modules/sd_vae_approx.py @@ -1,10 +1,6 @@ import os import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from torch import nn from modules import devices, paths diff --git a/modules/sub_quadratic_attention.py b/modules/sub_quadratic_attention.py index 0af680de2..87c18a38d 100644 --- a/modules/sub_quadratic_attention.py +++ b/modules/sub_quadratic_attention.py @@ -14,10 +14,6 @@ from functools import partial import math from typing import Optional, NamedTuple, List import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from torch import Tensor from torch.utils.checkpoint import checkpoint diff --git a/modules/textual_inversion/dataset.py b/modules/textual_inversion/dataset.py index 272ae76ea..af9fbcf28 100644 --- a/modules/textual_inversion/dataset.py +++ b/modules/textual_inversion/dataset.py @@ -2,10 +2,6 @@ import os import numpy as np import PIL import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from PIL import Image from torch.utils.data import Dataset, DataLoader, Sampler from torchvision import transforms diff --git a/modules/textual_inversion/image_embedding.py b/modules/textual_inversion/image_embedding.py index a2c518af3..0ba5db8a4 100644 --- a/modules/textual_inversion/image_embedding.py +++ b/modules/textual_inversion/image_embedding.py @@ -4,10 +4,6 @@ import numpy as np import zlib from PIL import Image, PngImagePlugin, ImageDraw, ImageFont import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass from modules.shared import opts diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py index fc4507ac3..72be41bb4 100644 --- a/modules/textual_inversion/textual_inversion.py +++ b/modules/textual_inversion/textual_inversion.py @@ -3,10 +3,6 @@ import html import csv from collections import namedtuple import torch -try: - import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import -except: - pass import tqdm import safetensors.torch import numpy as np diff --git a/modules/xlmr.py b/modules/xlmr.py index a891beb6d..9da3161cc 100644 --- a/modules/xlmr.py +++ b/modules/xlmr.py @@ -1,9 +1,5 @@ from typing import Optional import torch -try: - import intel_extension_for_pytorch as ipex -except: - pass import torch.nn as nn from transformers import XLMRobertaModel,XLMRobertaTokenizer, BertPreTrainedModel, BertModel, BertConfig # pylint: disable=unused-import from transformers.models.xlm_roberta.configuration_xlm_roberta import XLMRobertaConfig