Merge pull request #750 from Disty0/master

Remove unnecessary IPEX imports

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'] }

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

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

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

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

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
 

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

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
 

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
 

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

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

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

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

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
 
 

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
 
 

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

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

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

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

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

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
 

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
 
 

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

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

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

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
 

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

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

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
 

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

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
 

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
 

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

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
 

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 = {}

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
 

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
 

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

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
 
 

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

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