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

refactor: rename max_num_boxes to max_detections

Browse Source
This commit is contained in:
Manuel Schmid
2024-06-18 21:07:27 +02:00
parent b7fb42436c
commit 229ff81738
5 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
+4 -4
View File
@@ -123,7 +123,7 @@ class AsyncTask:
enhance_mask_sam_model = args.pop()
enhance_mask_text_threshold = args.pop()
enhance_mask_box_threshold = args.pop()
enhance_mask_sam_max_num_boxes = args.pop()
enhance_mask_sam_max_detections = args.pop()
enhance_inpaint_disable_initial_latent = args.pop()
enhance_inpaint_engine = args.pop()
enhance_inpaint_strength = args.pop()
@@ -137,7 +137,7 @@ class AsyncTask:
enhance_mask_sam_model,
enhance_mask_text_threshold,
enhance_mask_box_threshold,
enhance_mask_sam_max_num_boxes,
enhance_mask_sam_max_detections,
enhance_inpaint_disable_initial_latent,
enhance_inpaint_engine,
enhance_inpaint_strength,
@@ -1160,7 +1160,7 @@ def worker():
current_task_id = -1
for imgs in generated_imgs.values():
for img in imgs:
for enhance_mask_dino_prompt_text, enhance_prompt, enhance_negative_prompt, enhance_mask_model, enhance_mask_sam_model, enhance_mask_text_threshold, enhance_mask_box_threshold, enhance_mask_sam_max_num_boxes, enhance_inpaint_disable_initial_latent, enhance_inpaint_engine, enhance_inpaint_strength, enhance_inpaint_respective_field in async_task.enhance_ctrls:
for enhance_mask_dino_prompt_text, enhance_prompt, enhance_negative_prompt, enhance_mask_model, enhance_mask_sam_model, enhance_mask_text_threshold, enhance_mask_box_threshold, enhance_mask_sam_max_detections, enhance_inpaint_disable_initial_latent, enhance_inpaint_engine, enhance_inpaint_strength, enhance_inpaint_respective_field in async_task.enhance_ctrls:
current_task_id += 1
current_progress = int(base_progress + (100 - preparation_steps) * float(current_task_id * async_task.steps) / float(all_steps))
progressbar(async_task, current_progress, f'Preparing enhancement {current_task_id + 1}/{total_count} ...')
@@ -1176,7 +1176,7 @@ def worker():
dino_text_threshold=enhance_mask_text_threshold,
dino_erode_or_dilate=async_task.dino_erode_or_dilate,
dino_debug=async_task.debugging_dino,
max_num_boxes=enhance_mask_sam_max_num_boxes,
max_detections=enhance_mask_sam_max_detections,
model_type=enhance_mask_sam_model
))
if len(mask.shape) == 3:
modules/config.py
+4 -4
View File
@@ -516,10 +516,10 @@ default_enhance_tabs = get_config_item_or_set_default(
validator=lambda x: isinstance(x, int) and 1 <= x <= 5,
expected_type=int
)
default_sam_max_num_boxes = get_config_item_or_set_default(
key='default_sam_max_num_boxes',
default_value=2,
validator=lambda x: isinstance(x, int) and 1 <= x <= 5,
default_sam_max_detections = get_config_item_or_set_default(
key='default_sam_max_detections',
default_value=0,
validator=lambda x: isinstance(x, int) and 0 <= x <= 10,
expected_type=int
)
default_black_out_nsfw = get_config_item_or_set_default(