From 681c20dbbd5be48345550f265bc3c111adb80b21 Mon Sep 17 00:00:00 2001 From: KRSHH <136873090+KRSHH@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:16:56 +0530 Subject: [PATCH] Revert "Make Face Enhancer Model device Conditional" This reverts commit c240f6e31c98a4d4e93eb178982ded27d3e51e2b. --- modules/processors/frame/face_enhancer.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/modules/processors/frame/face_enhancer.py b/modules/processors/frame/face_enhancer.py index 72e5eff..7874e35 100644 --- a/modules/processors/frame/face_enhancer.py +++ b/modules/processors/frame/face_enhancer.py @@ -9,8 +9,6 @@ import modules.processors.frame.core from modules.core import update_status from modules.face_analyser import get_one_face from modules.typing import Frame, Face -import platform -import torch from modules.utilities import ( conditional_download, is_image, @@ -23,10 +21,7 @@ THREAD_LOCK = threading.Lock() NAME = "DLC.FACE-ENHANCER" abs_dir = os.path.dirname(os.path.abspath(__file__)) -models_dir = os.path.join( - os.path.dirname(os.path.dirname(os.path.dirname(abs_dir))), "models" -) - +models_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(abs_dir))), 'models') def pre_check() -> bool: download_directory_path = models_dir @@ -53,14 +48,8 @@ def get_face_enhancer() -> Any: with THREAD_LOCK: if FACE_ENHANCER is None: - model_path = os.path.join(models_dir, "GFPGANv1.4.pth") - if platform.system() == "Darwin": # Mac OS - mps_device = None - 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: # Other OS - FACE_ENHANCER = gfpgan.GFPGANer(model_path=model_path, upscale=1) # type: ignore[attr-defined] + model_path = os.path.join(models_dir, 'GFPGANv1.4.pth') + FACE_ENHANCER = gfpgan.GFPGANer(model_path=model_path, upscale=1) # type: ignore[attr-defined] return FACE_ENHANCER