From 75b5b096d64663874e6e0b11afb5abad4f573900 Mon Sep 17 00:00:00 2001 From: NeuroDonu <112660822+NeuroDonu@users.noreply.github.com> Date: Sat, 19 Apr 2025 16:03:24 +0300 Subject: [PATCH 1/2] fix --- modules/processors/frame/core.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/modules/processors/frame/core.py b/modules/processors/frame/core.py index 7d76704..6d99fd1 100644 --- a/modules/processors/frame/core.py +++ b/modules/processors/frame/core.py @@ -42,18 +42,29 @@ def get_frame_processors_modules(frame_processors: List[str]) -> List[ModuleType def set_frame_processors_modules_from_ui(frame_processors: List[str]) -> None: global FRAME_PROCESSORS_MODULES + current_processor_names = [proc.__name__.split('.')[-1] for proc in FRAME_PROCESSORS_MODULES] + for frame_processor, state in modules.globals.fp_ui.items(): - if state == True and frame_processor not in frame_processors: - frame_processor_module = load_frame_processor_module(frame_processor) - FRAME_PROCESSORS_MODULES.append(frame_processor_module) - modules.globals.frame_processors.append(frame_processor) - if state == False: + if state == True and frame_processor not in current_processor_names: try: frame_processor_module = load_frame_processor_module(frame_processor) - FRAME_PROCESSORS_MODULES.remove(frame_processor_module) - modules.globals.frame_processors.remove(frame_processor) - except: - pass + FRAME_PROCESSORS_MODULES.append(frame_processor_module) + if frame_processor not in modules.globals.frame_processors: + modules.globals.frame_processors.append(frame_processor) + except SystemExit: + print(f"Warning: Failed to load frame processor {frame_processor} requested by UI state.") + except Exception as e: + print(f"Warning: Error loading frame processor {frame_processor} requested by UI state: {e}") + + elif state == False and frame_processor in current_processor_names: + try: + module_to_remove = next((mod for mod in FRAME_PROCESSORS_MODULES if mod.__name__.endswith(f'.{frame_processor}')), None) + if module_to_remove: + FRAME_PROCESSORS_MODULES.remove(module_to_remove) + if frame_processor in modules.globals.frame_processors: + modules.globals.frame_processors.remove(frame_processor) + except Exception as e: + print(f"Warning: Error removing frame processor {frame_processor}: {e}") def multi_process_frame(source_path: str, temp_frame_paths: List[str], process_frames: Callable[[str, List[str], Any], None], progress: Any = None) -> None: with ThreadPoolExecutor(max_workers=modules.globals.execution_threads) as executor: From 890beb0eae2f2668219ada2756d40606381fc936 Mon Sep 17 00:00:00 2001 From: NeuroDonu <112660822+NeuroDonu@users.noreply.github.com> Date: Sat, 19 Apr 2025 16:03:49 +0300 Subject: [PATCH 2/2] fix & add trt support --- modules/processors/frame/face_enhancer.py | 39 +++++++++++++++++------ 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/modules/processors/frame/face_enhancer.py b/modules/processors/frame/face_enhancer.py index 4e1fdff..de192e6 100644 --- a/modules/processors/frame/face_enhancer.py +++ b/modules/processors/frame/face_enhancer.py @@ -48,6 +48,17 @@ def pre_start() -> bool: return True +TENSORRT_AVAILABLE = False +try: + import torch_tensorrt + TENSORRT_AVAILABLE = True +except ImportError as im: + print(f"TensorRT is not available: {im}") + pass +except Exception as e: + print(f"TensorRT is not available: {e}") + pass + def get_face_enhancer() -> Any: global FACE_ENHANCER @@ -55,16 +66,26 @@ def get_face_enhancer() -> Any: if FACE_ENHANCER is None: model_path = os.path.join(models_dir, "GFPGANv1.4.pth") - match platform.system(): - case "Darwin": # Mac OS - if torch.backends.mps.is_available(): - mps_device = torch.device("mps") - FACE_ENHANCER = gfpgan.GFPGANer(model_path=model_path, upscale=1, device=mps_device) # type: ignore[attr-defined] - else: - FACE_ENHANCER = gfpgan.GFPGANer(model_path=model_path, upscale=1) # type: ignore[attr-defined] - case _: # Other OS - FACE_ENHANCER = gfpgan.GFPGANer(model_path=model_path, upscale=1) # type: ignore[attr-defined] + selected_device = None + device_priority = [] + if TENSORRT_AVAILABLE and torch.cuda.is_available(): + selected_device = torch.device("cuda") + device_priority.append("TensorRT+CUDA") + elif torch.cuda.is_available(): + selected_device = torch.device("cuda") + device_priority.append("CUDA") + elif torch.backends.mps.is_available() and platform.system() == "Darwin": + selected_device = torch.device("mps") + device_priority.append("MPS") + elif not torch.cuda.is_available(): + selected_device = torch.device("cpu") + device_priority.append("CPU") + + FACE_ENHANCER = gfpgan.GFPGANer(model_path=model_path, upscale=1, device=selected_device) + + # for debug: + print(f"Selected device: {selected_device} and device priority: {device_priority}") return FACE_ENHANCER