diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-13 12:21:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 12:21:39 +0000 |
| commit | b7c5b30f14aadffadd2d35cb3ecb3e91af00581d (patch) | |
| tree | 0e51f517bb6ac010c0e3dc5937d112656ec9ee9a /modules/devices.py | |
| parent | 14501f56aaf3c97fb2c38633350dc747b9651f43 (diff) | |
| parent | 262ec8ecdaf10d8fe49d0227e24bd3a1459e87b5 (diff) | |
| download | stable-diffusion-webui-gfx803-b7c5b30f14aadffadd2d35cb3ecb3e91af00581d.tar.gz stable-diffusion-webui-gfx803-b7c5b30f14aadffadd2d35cb3ecb3e91af00581d.tar.bz2 stable-diffusion-webui-gfx803-b7c5b30f14aadffadd2d35cb3ecb3e91af00581d.zip | |
Merge branch 'dev' into master
Diffstat (limited to 'modules/devices.py')
| -rw-r--r-- | modules/devices.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/modules/devices.py b/modules/devices.py index 1ed6ffdc..57e51da3 100644 --- a/modules/devices.py +++ b/modules/devices.py @@ -15,13 +15,6 @@ def has_mps() -> bool: else: return mac_specific.has_mps -def extract_device_id(args, name): - for x in range(len(args)): - if name in args[x]: - return args[x + 1] - - return None - def get_cuda_device_string(): from modules import shared @@ -56,11 +49,15 @@ def get_device_for(task): def torch_gc(): + if torch.cuda.is_available(): with torch.cuda.device(get_cuda_device_string()): torch.cuda.empty_cache() torch.cuda.ipc_collect() + if has_mps(): + mac_specific.torch_mps_gc() + def enable_tf32(): if torch.cuda.is_available(): |