diff options
| author | d8ahazard <d8ahazard@gmail.com> | 2022-09-20 20:11:53 -0500 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2022-09-22 07:21:54 +0300 |
| commit | dd5566814acb9623b201c441b458d0d6a7014f2f (patch) | |
| tree | bbc151c3f2b978aaefec9c8afc7f58cdb452ed62 | |
| parent | cc287d53a5193aab42fa36bedae1ac590ad52322 (diff) | |
Add new models, fix shared opts issues
Add General x4x3, GeneralWDN x4x3, and AnimeVideo models from newer ESRGAN releases.
Fix issues caused by renaming ESRGAN_tille values to GAN_tile without using an IDE...
| -rw-r--r-- | modules/esrgan_model.py | 4 | ||||
| -rw-r--r-- | modules/realesrgan_model.py | 33 |
2 files changed, 29 insertions, 8 deletions
diff --git a/modules/esrgan_model.py b/modules/esrgan_model.py index 7f3baf31..930e790c 100644 --- a/modules/esrgan_model.py +++ b/modules/esrgan_model.py @@ -92,10 +92,10 @@ def upscale_without_tiling(model, img): def esrgan_upscale(model, img):
- if opts.ESRGAN_tile == 0:
+ if opts.GAN_tile == 0:
return upscale_without_tiling(model, img)
- grid = modules.images.split_grid(img, opts.ESRGAN_tile, opts.ESRGAN_tile, opts.ESRGAN_tile_overlap)
+ grid = modules.images.split_grid(img, opts.GAN_tile, opts.GAN_tile, opts.GAN_tile_overlap)
newtiles = []
scale_factor = 1
diff --git a/modules/realesrgan_model.py b/modules/realesrgan_model.py index e2cef0c8..1f1af0c3 100644 --- a/modules/realesrgan_model.py +++ b/modules/realesrgan_model.py @@ -2,7 +2,11 @@ import sys import traceback
from collections import namedtuple
import numpy as np
+import torch
from PIL import Image
+from basicsr.archs.rrdbnet_arch import RRDBNet
+from realesrgan import RealESRGANer
+from realesrgan.archs.srvgg_arch import SRVGGNetCompact
import modules.images
from modules.shared import cmd_opts, opts
@@ -36,8 +40,26 @@ def setup_realesrgan(): realesrgan_models = [
RealesrganModelInfo(
+ name="Real-ESRGAN General x4x3",
+ location="https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-x4v3.pth",
+ netscale=4,
+ model=lambda: SRVGGNetCompact(num_in_ch=3, num_out_ch=3, num_feat=64, num_conv=32, upscale=4, act_type='prelu')
+ ),
+ RealesrganModelInfo(
+ name="Real-ESRGAN General WDN x4x3",
+ location="https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-wdn-x4v3.pth",
+ netscale=4,
+ model=lambda: SRVGGNetCompact(num_in_ch=3, num_out_ch=3, num_feat=64, num_conv=32, upscale=4, act_type='prelu')
+ ),
+ RealesrganModelInfo(
+ name="Real-ESRGAN AnimeVideo",
+ location="https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-animevideov3.pth",
+ netscale=4,
+ model=lambda: SRVGGNetCompact(num_in_ch=3, num_out_ch=3, num_feat=64, num_conv=16, upscale=4, act_type='prelu')
+ ),
+ RealesrganModelInfo(
name="Real-ESRGAN 4x plus",
- location="https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth",
+ location="https://github.com/xinntao/Real-ESRGA N/releases/download/v0.1.0/RealESRGAN_x4plus.pth",
netscale=4, model=lambda: RRDBNet(num_in_ch=3, num_out_ch=3, num_feat=64, num_block=23, num_grow_ch=32, scale=4)
),
RealesrganModelInfo(
@@ -64,21 +86,20 @@ def setup_realesrgan(): realesrgan_models = [RealesrganModelInfo('None', '', 0, None)]
have_realesrgan = False
-
def upscale_with_realesrgan(image, RealESRGAN_upscaling, RealESRGAN_model_index):
- if not have_realesrgan or RealESRGANer_constructor is None:
+ if not have_realesrgan:
return image
info = realesrgan_models[RealESRGAN_model_index]
model = info.model()
- upsampler = RealESRGANer_constructor(
+ upsampler = RealESRGANer(
scale=info.netscale,
model_path=info.location,
model=model,
half=not cmd_opts.no_half,
- tile=opts.ESRGAN_tile,
- tile_pad=opts.ESRGAN_tile_overlap,
+ tile=opts.GAN_tile,
+ tile_pad=opts.GAN_tile_overlap,
)
upsampled = upsampler.enhance(np.array(image), outscale=RealESRGAN_upscaling)[0]
|