Merge remote-tracking branch 'upstream/master' into cleanup_if_idle

This commit is contained in:
Sida Liu 2024-05-03 00:08:46 +00:00
commit 2f9f538158
2 changed files with 3 additions and 5 deletions

View File

@ -83,7 +83,7 @@ def get_torch_device():
return torch.device("cpu") return torch.device("cpu")
else: else:
if is_intel_xpu(): if is_intel_xpu():
return torch.device("xpu") return torch.device("xpu", torch.xpu.current_device())
else: else:
return torch.device(torch.cuda.current_device()) return torch.device(torch.cuda.current_device())
@ -304,7 +304,7 @@ class LoadedModel:
raise e raise e
if is_intel_xpu() and not args.disable_ipex_optimize: if is_intel_xpu() and not args.disable_ipex_optimize:
self.real_model = torch.xpu.optimize(self.real_model.eval(), inplace=True, auto_kernel_selection=True, graph_mode=True) self.real_model = ipex.optimize(self.real_model.eval(), graph_mode=True, concat_linear=True)
self.weights_loaded = True self.weights_loaded = True
return self.real_model return self.real_model
@ -552,8 +552,6 @@ def text_encoder_device():
if args.gpu_only: if args.gpu_only:
return get_torch_device() return get_torch_device()
elif vram_state == VRAMState.HIGH_VRAM or vram_state == VRAMState.NORMAL_VRAM: elif vram_state == VRAMState.HIGH_VRAM or vram_state == VRAMState.NORMAL_VRAM:
if is_intel_xpu():
return torch.device("cpu")
if should_use_fp16(prioritize_performance=False): if should_use_fp16(prioritize_performance=False):
return get_torch_device() return get_torch_device()
else: else:

View File

@ -229,7 +229,7 @@ function createIntWidget(node, inputName, inputData, app, isSeedInput) {
val, val,
function (v) { function (v) {
const s = this.options.step / 10; const s = this.options.step / 10;
this.value = Math.round(v / s) * s; this.value = Math.round((v - this.options.min) / s) * s + this.options.min;
}, },
config config
), ),