diff options
| author | Dynamic <bradje@naver.com> | 2022-10-23 13:36:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-23 13:36:56 +0000 |
| commit | 660ae690bd7107b78aac6413e1370f8cd72676bc (patch) | |
| tree | b666cfd0872687ccd293a41d9d0a90fcdfe1ea0a /modules/deepbooru.py | |
| parent | 21364c5c39b269497944b56dd6664792d779333b (diff) | |
| parent | 6bd6154a92eb05c80d66df661a38f8b70cc13729 (diff) | |
| download | stable-diffusion-webui-gfx803-660ae690bd7107b78aac6413e1370f8cd72676bc.tar.gz stable-diffusion-webui-gfx803-660ae690bd7107b78aac6413e1370f8cd72676bc.tar.bz2 stable-diffusion-webui-gfx803-660ae690bd7107b78aac6413e1370f8cd72676bc.zip | |
Merge branch 'AUTOMATIC1111:master' into kr-localization
Diffstat (limited to 'modules/deepbooru.py')
| -rw-r--r-- | modules/deepbooru.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/deepbooru.py b/modules/deepbooru.py index 4ad334a1..8bbc90a4 100644 --- a/modules/deepbooru.py +++ b/modules/deepbooru.py @@ -50,11 +50,12 @@ def create_deepbooru_process(threshold, deepbooru_opts): the tags. """ from modules import shared # prevents circular reference - shared.deepbooru_process_manager = multiprocessing.Manager() + context = multiprocessing.get_context("spawn") + shared.deepbooru_process_manager = context.Manager() shared.deepbooru_process_queue = shared.deepbooru_process_manager.Queue() shared.deepbooru_process_return = shared.deepbooru_process_manager.dict() shared.deepbooru_process_return["value"] = -1 - shared.deepbooru_process = multiprocessing.Process(target=deepbooru_process, args=(shared.deepbooru_process_queue, shared.deepbooru_process_return, threshold, deepbooru_opts)) + shared.deepbooru_process = context.Process(target=deepbooru_process, args=(shared.deepbooru_process_queue, shared.deepbooru_process_return, threshold, deepbooru_opts)) shared.deepbooru_process.start() @@ -157,8 +158,7 @@ def get_deepbooru_tags_from_model(model, tags, pil_image, threshold, deepbooru_o # sort by reverse by likelihood and normal for alpha, and format tag text as requested unsorted_tags_in_theshold.sort(key=lambda y: y[sort_ndx], reverse=(not alpha_sort)) for weight, tag in unsorted_tags_in_theshold: - # note: tag_outformat will still have a colon if include_ranks is True - tag_outformat = tag.replace(':', ' ') + tag_outformat = tag if use_spaces: tag_outformat = tag_outformat.replace('_', ' ') if use_escape: |