diff options
| author | mawr <mawr@mail.ru> | 2022-10-30 21:14:07 +0000 |
|---|---|---|
| committer | mawr <mawr@mail.ru> | 2022-10-30 21:14:07 +0000 |
| commit | d587586d3be2de061238defb8a556f03743287f6 (patch) | |
| tree | e77d86d46dbb7f39eb573e8ce50a2e0eb8fc31bb | |
| parent | 17a2076f72562b428052ee3fc8c43d19c03ecd1e (diff) | |
| download | stable-diffusion-webui-gfx803-d587586d3be2de061238defb8a556f03743287f6.tar.gz stable-diffusion-webui-gfx803-d587586d3be2de061238defb8a556f03743287f6.tar.bz2 stable-diffusion-webui-gfx803-d587586d3be2de061238defb8a556f03743287f6.zip | |
Added "--clip-models-path" switch to avoid using default "~/.cache/clip" and enable to run under unprivileged user without homedir
| -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 e4f163c1..36212031 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")
|