From aa41c08d2ff0d0795b2824df72879d4de6eec0cc Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Mon, 5 Jun 2023 11:52:16 -0300 Subject: [PATCH] Upscaler fix & frontend model selection naming chanes --- skynet/dgpu/compute.py | 2 +- skynet/frontend/__init__.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/skynet/dgpu/compute.py b/skynet/dgpu/compute.py index 424d704..ce34910 100644 --- a/skynet/dgpu/compute.py +++ b/skynet/dgpu/compute.py @@ -144,7 +144,7 @@ class SkynetMM: if upscaler == 'x4': input_img = image.convert('RGB') - up_img, _ = upscaler.enhance( + up_img, _ = self.upscaler.enhance( convert_from_image_to_cv2(input_img), outscale=4) image = convert_from_cv2_to_image(up_img) diff --git a/skynet/frontend/__init__.py b/skynet/frontend/__init__.py index 6a2557e..46ebd9f 100644 --- a/skynet/frontend/__init__.py +++ b/skynet/frontend/__init__.py @@ -32,9 +32,12 @@ def validate_user_config_request(req: str): match attr: case 'algo': val = params[2] - if val not in ALGOS: + shorts = [model_info['short'] for model_info in MODELS.values()] + if val not in shorts: raise ConfigUnknownAlgorithm(f'no algo named {val}') + val = get_model_by_shortname(val) + case 'step': val = int(params[2]) val = max(min(val, MAX_STEP), MIN_STEP)