From b5d1af11b7dc718d4d91d379c75e46f4bd2e2fe6 Mon Sep 17 00:00:00 2001 From: Abdullah Barhoum Date: Sun, 11 Sep 2022 07:11:27 +0200 Subject: Modular device management --- modules/shared.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'modules/shared.py') diff --git a/modules/shared.py b/modules/shared.py index 6ca9106c..74b0ad89 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -9,6 +9,7 @@ import tqdm import modules.artists from modules.paths import script_path, sd_path +from modules.devices import get_optimal_device import modules.styles config_filename = "config.json" @@ -43,12 +44,8 @@ parser.add_argument("--ui-config-file", type=str, help="filename to use for ui c cmd_opts = parser.parse_args() -if torch.has_cuda: - device = torch.device("cuda") -elif torch.has_mps: - device = torch.device("mps") -else: - device = torch.device("cpu") +device = get_optimal_device() + batch_cond_uncond = cmd_opts.always_batch_cond_uncond or not (cmd_opts.lowvram or cmd_opts.medvram) parallel_processing_allowed = not cmd_opts.lowvram and not cmd_opts.medvram -- cgit v1.2.3