From c6ce43b00d4ee61da0eb55466869ee1f7ba6aa78 Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Mon, 16 Jan 2023 21:55:54 -0600 Subject: [PATCH] back to single GFPGAN, fix some paths --- api/onnx_web/convert.py | 8 +++----- gui/src/strings.ts | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/api/onnx_web/convert.py b/api/onnx_web/convert.py index c8e6fae9..19393fdc 100644 --- a/api/onnx_web/convert.py +++ b/api/onnx_web/convert.py @@ -24,9 +24,7 @@ sources: Dict[str, List[Tuple[str, str]]] = { 'stabilityai/stable-diffusion-2-inpainting'), ], 'gfpgan': [ - ('correction-gfpgan-v1-3-x2', - 'https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth', 2), - ('correction-gfpgan-v1-3-x4', + ('correction-gfpgan-v1-3', 'https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth', 4), ], 'real_esrgan': [ @@ -57,7 +55,7 @@ def convert_real_esrgan(name: str, url: str, scale: int, opset: int): if not path.isfile(dest_path): print('PTH model not found, downloading...') download_path = load_file_from_url( - url=url, model_dir=dest_path + '.cache', progress=True, file_name=None) + url=url, model_dir=dest_path + '-cache', progress=True, file_name=None) copyfile(download_path, dest_path) print('loading and training model') @@ -106,7 +104,7 @@ def convert_gfpgan(name: str, url: str, scale: int, opset: int): if not path.isfile(dest_path): print('PTH model not found, downloading...') download_path = load_file_from_url( - url=url, model_dir=dest_path + '.cache', progress=True, file_name=None) + url=url, model_dir=dest_path + '-cache', progress=True, file_name=None) copyfile(download_path, dest_path) print('loading and training model') diff --git a/gui/src/strings.ts b/gui/src/strings.ts index a768b0b2..b7db329d 100644 --- a/gui/src/strings.ts +++ b/gui/src/strings.ts @@ -11,8 +11,7 @@ export const MODEL_LABELS = { 'upscaling-real-esrgan-x4-plus': 'Real ESRGAN x4 Plus', 'upscaling-real-esrgan-x4-v3': 'Real ESRGAN x4 v3', // correction - 'correction-gfpgan-v1-3-x2': 'GFPGAN v1.3 x2', - 'correction-gfpgan-v1-3-x4': 'GFPGAN v1.3 x4', + 'correction-gfpgan-v1-3': 'GFPGAN v1.3', };