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: correctly reset pipeline

Browse Source 
reset unet and inpaint worker after each adetailer task, improve memory efficiency
This commit is contained in:
Manuel Schmid
2024-06-09 01:10:11 +02:00
parent df70294a3e
commit 5d8353eb74
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
+29 -20
View File
@@ -229,7 +229,7 @@ def worker():
def process_task(all_steps, async_task, callback, controlnet_canny_path, controlnet_cpds_path, current_task_id, def process_task(all_steps, async_task, callback, controlnet_canny_path, controlnet_cpds_path, current_task_id,
denoising_strength, final_scheduler_name, goals, initial_latent, switch, task, tasks, denoising_strength, final_scheduler_name, goals, initial_latent, switch, task, tasks,
tiled, use_expansion, width, height, cleanup_conds=True): tiled, use_expansion, width, height):
if async_task.last_stop is not False: if async_task.last_stop is not False:
ldm_patched.modules.model_management.interrupt_current_processing() ldm_patched.modules.model_management.interrupt_current_processing()
positive_cond, negative_cond = task['c'], task['uc'] positive_cond, negative_cond = task['c'], task['uc']
@@ -260,8 +260,7 @@ def worker():
refiner_swap_method=async_task.refiner_swap_method, refiner_swap_method=async_task.refiner_swap_method,
disable_preview=async_task.disable_preview disable_preview=async_task.disable_preview
) )
if cleanup_conds: del positive_cond, negative_cond # Save memory
del task['c'], task['uc'], positive_cond, negative_cond # Save memory
if inpaint_worker.current_task is not None: if inpaint_worker.current_task is not None:
imgs = [inpaint_worker.current_task.post_process(x) for x in imgs] imgs = [inpaint_worker.current_task.post_process(x) for x in imgs]
current_progress = int(flags.preparation_step_count + (100 - flags.preparation_step_count) * float( current_progress = int(flags.preparation_step_count + (100 - flags.preparation_step_count) * float(
@@ -833,6 +832,7 @@ def worker():
skip_prompt_processing = False skip_prompt_processing = False
inpaint_worker.current_task = None
inpaint_parameterized = async_task.inpaint_engine != 'None' inpaint_parameterized = async_task.inpaint_engine != 'None'
inpaint_image = None inpaint_image = None
inpaint_mask = None inpaint_mask = None
@@ -1010,9 +1010,12 @@ def worker():
try: try:
imgs, img_paths = process_task(all_steps, async_task, callback, controlnet_canny_path, controlnet_cpds_path, imgs, img_paths = process_task(all_steps, async_task, callback, controlnet_canny_path, controlnet_cpds_path,
current_task_id, denoising_strength, final_scheduler_name, goals, initial_latent, current_task_id, denoising_strength, final_scheduler_name, goals, initial_latent,
switch, task, tasks, tiled, use_expansion, width, height, False) switch, task, tasks, tiled, use_expansion, width, height)
# adetailer # adetailer
progressbar(async_task, current_progress, 'Processing adetailer ...')
final_unet = pipeline.final_unet.clone()
for img in imgs: for img in imgs:
from extras.adetailer.ultralytics_predict import ultralytics_predict from extras.adetailer.ultralytics_predict import ultralytics_predict
predictor = ultralytics_predict predictor = ultralytics_predict
@@ -1028,30 +1031,35 @@ def worker():
if pred.preview is None: if pred.preview is None:
print( print(
f"[-] ADetailer: nothing detected on image" f"[ADetailer] nothing detected on image"
) )
return False continue
from extras.adetailer.args import ADetailerArgs from extras.adetailer.args import ADetailerArgs
args = ADetailerArgs() args = ADetailerArgs()
from extras.adetailer.script import pred_preprocessing from extras.adetailer.script import pred_preprocessing
masks = pred_preprocessing(img, pred, args) masks = pred_preprocessing(img, pred, args)
merged_masks = np.maximum(*[np.array(mask) for mask in masks]) merged_masks = np.maximum(*[np.array(mask) for mask in masks])
async_task.yields.append(['preview', (100, '...', merged_masks)]) async_task.yields.append(['preview', (current_progress, 'Loading ...', merged_masks)])
denoising_strength = 0.5 # TODO also show do_not_show_finished_images=len(tasks) == 1 when adetailer is on
inpaint_head_model_path = None yield_result(async_task, merged_masks, async_task.black_out_nsfw, False,
inpaint_parameterized = False do_not_show_finished_images=len(tasks) == 1 or async_task.disable_intermediate_results)
denoising_strength, initial_latent, width, height = apply_inpaint(async_task, None, denoising_strength_adetailer = 0.5
inpaint_head_model_path, img, inpaint_head_model_path_adetailer = None
merged_masks, inpaint_parameterized_adetailer = False
inpaint_parameterized, goals_adetailer = ['inpaint']
denoising_strength, switch) denoising_strength_adetailer, initial_latent_adetailer, width_adetailer, height_adetailer = apply_inpaint(
async_task, None, inpaint_head_model_path_adetailer, img, merged_masks,
inpaint_parameterized_adetailer, denoising_strength_adetailer, switch)
imgs, img_paths = process_task(all_steps, async_task, callback, controlnet_canny_path, process_task(all_steps, async_task, callback, controlnet_canny_path, controlnet_cpds_path,
controlnet_cpds_path, current_task_id, denoising_strength_adetailer, final_scheduler_name, goals_adetailer,
current_task_id, denoising_strength, final_scheduler_name, goals, initial_latent_adetailer, switch, task, tasks, tiled, use_expansion, width_adetailer,
initial_latent, height_adetailer)
switch, task, tasks, tiled, use_expansion, width, height)
# reset unet and inpaint_worker
pipeline.final_unet = final_unet
inpaint_worker.current_task = None
except ldm_patched.modules.model_management.InterruptProcessingException: except ldm_patched.modules.model_management.InterruptProcessingException:
if async_task.last_stop == 'skip': if async_task.last_stop == 'skip':
@@ -1062,6 +1070,7 @@ def worker():
print('User stopped') print('User stopped')
break break
del task['c'], task['uc'] # Save memory
execution_time = time.perf_counter() - execution_start_time execution_time = time.perf_counter() - execution_start_time
print(f'Generating and saving time: {execution_time:.2f} seconds') print(f'Generating and saving time: {execution_time:.2f} seconds')