diff options
author | random-thoughtss <116161560+random-thoughtss@users.noreply.github.com> | 2022-10-27 18:19:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-27 18:19:12 +0000 |
commit | f3f2ffd448bae76c0f731ecd96550a1aecf24ea9 (patch) | |
tree | 436a8d6be7a1430fdc6b4cba900521f8232ebc1d /modules/shared.py | |
parent | 8b4f32779f28010fc8077e8fcfb85a3205b36bc2 (diff) | |
parent | 737eb28faca8be2bb996ee0930ec77d1f7ebd939 (diff) | |
download | stable-diffusion-webui-gfx803-f3f2ffd448bae76c0f731ecd96550a1aecf24ea9.tar.gz stable-diffusion-webui-gfx803-f3f2ffd448bae76c0f731ecd96550a1aecf24ea9.tar.bz2 stable-diffusion-webui-gfx803-f3f2ffd448bae76c0f731ecd96550a1aecf24ea9.zip |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/shared.py')
-rw-r--r-- | modules/shared.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/shared.py b/modules/shared.py index e0ffb824..d47378e8 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -84,7 +84,7 @@ parser.add_argument("--ui-debug-mode", action='store_true', help="Don't load mod parser.add_argument("--device-id", type=str, help="Select the default CUDA device to use (export CUDA_VISIBLE_DEVICES=0,1,etc might be needed before)", default=None)
cmd_opts = parser.parse_args()
-restricted_opts = [
+restricted_opts = {
"samples_filename_pattern",
"directories_filename_pattern",
"outdir_samples",
@@ -94,7 +94,7 @@ restricted_opts = [ "outdir_grids",
"outdir_txt2img_grids",
"outdir_save",
-]
+}
devices.device, devices.device_interrogate, devices.device_gfpgan, devices.device_swinir, devices.device_esrgan, devices.device_scunet, devices.device_codeformer = \
(devices.cpu if any(y in cmd_opts.use_cpu for y in [x, 'all']) else devices.get_optimal_device() for x in ['sd', 'interrogate', 'gfpgan', 'swinir', 'esrgan', 'scunet', 'codeformer'])
|