Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
lllyasviel
2023-10-16 23:50:23 -07:00
parent 6fce823fc4
commit 32ff981075
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fooocus_version.py
+1 -1
View File
@@ -1 +1 @@
version = '2.1.687' version = '2.1.688'
modules/async_worker.py
+12 -10
View File
@@ -231,6 +231,9 @@ def worker():
for i in range(image_number): for i in range(image_number):
task_seed = seed + i task_seed = seed + i
task_prompt = apply_wildcards(prompt, task_seed) task_prompt = apply_wildcards(prompt, task_seed)
task_negative_prompt = apply_wildcards(negative_prompt, task_seed)
task_extra_positive_prompts = [apply_wildcards(pmt, task_seed) for pmt in extra_positive_prompts]
task_extra_negative_prompts = [apply_wildcards(pmt, task_seed) for pmt in extra_negative_prompts]
positive_basic_workloads = [] positive_basic_workloads = []
negative_basic_workloads = [] negative_basic_workloads = []
@@ -243,16 +246,13 @@ def worker():
else: else:
positive_basic_workloads.append(task_prompt) positive_basic_workloads.append(task_prompt)
negative_basic_workloads.append(negative_prompt) # Always use independent workload for negative. negative_basic_workloads.append(task_negative_prompt) # Always use independent workload for negative.
positive_basic_workloads = positive_basic_workloads + extra_positive_prompts positive_basic_workloads = positive_basic_workloads + task_extra_positive_prompts
negative_basic_workloads = negative_basic_workloads + extra_negative_prompts negative_basic_workloads = negative_basic_workloads + task_extra_negative_prompts
positive_basic_workloads = remove_empty_str(positive_basic_workloads, default=task_prompt) positive_basic_workloads = remove_empty_str(positive_basic_workloads, default=task_prompt)
negative_basic_workloads = remove_empty_str(negative_basic_workloads, default=negative_prompt) negative_basic_workloads = remove_empty_str(negative_basic_workloads, default=task_negative_prompt)
positive_top_k = len(positive_basic_workloads)
negative_top_k = len(negative_basic_workloads)
tasks.append(dict( tasks.append(dict(
task_seed=task_seed, task_seed=task_seed,
@@ -261,7 +261,9 @@ def worker():
negative=negative_basic_workloads, negative=negative_basic_workloads,
expansion='', expansion='',
c=None, c=None,
uc=None uc=None,
positive_top_k=len(positive_basic_workloads),
negative_top_k=len(negative_basic_workloads)
)) ))
if use_expansion: if use_expansion:
@@ -274,11 +276,11 @@ def worker():
for i, t in enumerate(tasks): for i, t in enumerate(tasks):
progressbar(7, f'Encoding positive #{i + 1} ...') progressbar(7, f'Encoding positive #{i + 1} ...')
t['c'] = pipeline.clip_encode(texts=t['positive'], pool_top_k=positive_top_k) t['c'] = pipeline.clip_encode(texts=t['positive'], pool_top_k=t['positive_top_k'])
for i, t in enumerate(tasks): for i, t in enumerate(tasks):
progressbar(10, f'Encoding negative #{i + 1} ...') progressbar(10, f'Encoding negative #{i + 1} ...')
t['uc'] = pipeline.clip_encode(texts=t['negative'], pool_top_k=negative_top_k) t['uc'] = pipeline.clip_encode(texts=t['negative'], pool_top_k=t['negative_top_k'])
if len(goals) > 0: if len(goals) > 0:
progressbar(13, 'Image processing ...') progressbar(13, 'Image processing ...')