diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-11-01 15:19:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 15:19:12 +0000 |
| commit | d7622d97f213897a1e8fbebdfeae983dac06b043 (patch) | |
| tree | 74e8e835aa854bbe4fb7bec6c0f39453e989ebf2 /modules | |
| parent | f071a1d25aa8b35bb6406a133df1d03ae5ea8d01 (diff) | |
| parent | 095931afa43f9d469d711f7e67809a2c09a047bd (diff) | |
| download | stable-diffusion-webui-gfx803-d7622d97f213897a1e8fbebdfeae983dac06b043.tar.gz stable-diffusion-webui-gfx803-d7622d97f213897a1e8fbebdfeae983dac06b043.tar.bz2 stable-diffusion-webui-gfx803-d7622d97f213897a1e8fbebdfeae983dac06b043.zip | |
Merge pull request #4004 from mamawr/master
Added "--clip-models-path" switch
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/interrogate.py | 4 | ||||
| -rw-r--r-- | modules/shared.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/interrogate.py b/modules/interrogate.py index 65b05d34..9769aa34 100644 --- a/modules/interrogate.py +++ b/modules/interrogate.py @@ -56,9 +56,9 @@ class InterrogateModels: import clip
if self.running_on_cpu:
- model, preprocess = clip.load(clip_model_name, device="cpu")
+ model, preprocess = clip.load(clip_model_name, device="cpu", download_root=shared.cmd_opts.clip_models_path)
else:
- model, preprocess = clip.load(clip_model_name)
+ model, preprocess = clip.load(clip_model_name, download_root=shared.cmd_opts.clip_models_path)
model.eval()
model = model.to(devices.device_interrogate)
diff --git a/modules/shared.py b/modules/shared.py index 3fb36200..1ccb269a 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -51,6 +51,7 @@ parser.add_argument("--realesrgan-models-path", type=str, help="Path to director parser.add_argument("--scunet-models-path", type=str, help="Path to directory with ScuNET model file(s).", default=os.path.join(models_path, 'ScuNET'))
parser.add_argument("--swinir-models-path", type=str, help="Path to directory with SwinIR model file(s).", default=os.path.join(models_path, 'SwinIR'))
parser.add_argument("--ldsr-models-path", type=str, help="Path to directory with LDSR model file(s).", default=os.path.join(models_path, 'LDSR'))
+parser.add_argument("--clip-models-path", type=str, help="Path to directory with CLIP model file(s).", default=None)
parser.add_argument("--xformers", action='store_true', help="enable xformers for cross attention layers")
parser.add_argument("--force-enable-xformers", action='store_true', help="enable xformers for cross attention layers regardless of whether the checking code thinks you can run it; do not make bug reports if this fails to work")
parser.add_argument("--deepdanbooru", action='store_true', help="enable deepdanbooru interrogator")
|