StableDiffusion/WebUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eliminate duplicated code from #5095

Browse Source
This commit is contained in:
AUTOMATIC 2022-11-27 13:08:54 +03:00
parent 997ac57020
commit 5b2c316890
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/devices.py
View File

@ -24,17 +24,18 @@ def extract_device_id(args, name):
return None return None
def get_optimal_device(): def get_cuda_device_string():
if torch.cuda.is_available():
from modules import shared from modules import shared
device_id = shared.cmd_opts.device_id if shared.cmd_opts.device_id is not None:
return f"cuda:{shared.cmd_opts.device_id}"
if device_id is not None: return "cuda"
cuda_device = f"cuda:{device_id}"
return torch.device(cuda_device)
else: def get_optimal_device():
return torch.device("cuda") if torch.cuda.is_available():
return torch.device(get_cuda_device_string())
if has_mps(): if has_mps():
return torch.device("mps") return torch.device("mps")
@ -44,16 +45,7 @@ def get_optimal_device():
def torch_gc(): def torch_gc():
if torch.cuda.is_available(): if torch.cuda.is_available():
from modules import shared with torch.cuda.device(get_cuda_device_string()):
device_id = shared.cmd_opts.device_id
if device_id is not None:
cuda_device = f"cuda:{device_id}"
else:
cuda_device = "cuda"
with torch.cuda.device(cuda_device):
torch.cuda.empty_cache() torch.cuda.empty_cache()
torch.cuda.ipc_collect() torch.cuda.ipc_collect()