This commit is contained in:
lllyasviel
2024-01-25 13:20:43 -08:00
parent a286338859
commit d44608f5f5
6 changed files with 14 additions and 6 deletions

View File

@@ -1,7 +1,7 @@
import os
from modules.modelloader import load_file_from_url
from modules.upscaler import Upscaler, UpscalerData
from modules.upscaler import Upscaler, UpscalerData, prepare_free_memory
from ldsr_model_arch import LDSR
from modules import shared, script_callbacks, errors
import sd_hijack_autoencoder # noqa: F401
@@ -49,6 +49,7 @@ class UpscalerLDSR(Upscaler):
return LDSR(model, yaml)
def do_upscale(self, img, path):
prepare_free_memory()
try:
ldsr = self.load_model(path)
except Exception:

View File

@@ -5,7 +5,7 @@ import torch
from PIL import Image
from modules import devices, modelloader, script_callbacks, shared, upscaler_utils
from modules.upscaler import Upscaler, UpscalerData
from modules.upscaler import Upscaler, UpscalerData, prepare_free_memory
SWINIR_MODEL_URL = "https://github.com/JingyunLiang/SwinIR/releases/download/v0.0/003_realSR_BSRGAN_DFOWMFC_s64w8_SwinIR-L_x4_GAN.pth"
@@ -33,6 +33,8 @@ class UpscalerSwinIR(Upscaler):
self.scalers = scalers
def do_upscale(self, img: Image.Image, model_file: str) -> Image.Image:
prepare_free_memory()
current_config = (model_file, shared.opts.SWIN_tile)
if self._cached_model_config == current_config:

View File

@@ -2,7 +2,7 @@ import os
from modules import modelloader, errors
from modules.shared import cmd_opts, opts
from modules.upscaler import Upscaler, UpscalerData
from modules.upscaler import Upscaler, UpscalerData, prepare_free_memory
from modules.upscaler_utils import upscale_with_model
@@ -23,6 +23,7 @@ class UpscalerDAT(Upscaler):
self.scalers.append(model)
def do_upscale(self, img, path):
prepare_free_memory()
try:
info = self.load_model(path)
except Exception:

View File

@@ -1,6 +1,6 @@
from modules import modelloader, devices, errors
from modules.shared import opts
from modules.upscaler import Upscaler, UpscalerData
from modules.upscaler import Upscaler, UpscalerData, prepare_free_memory
from modules.upscaler_utils import upscale_with_model
@@ -27,6 +27,7 @@ class UpscalerESRGAN(Upscaler):
self.scalers.append(scaler_data)
def do_upscale(self, img, selected_model):
prepare_free_memory()
try:
model = self.load_model(selected_model)
except Exception:

View File

@@ -3,7 +3,7 @@ import sys
from modules import modelloader, devices
from modules.shared import opts
from modules.upscaler import Upscaler, UpscalerData
from modules.upscaler import Upscaler, UpscalerData, prepare_free_memory
from modules.upscaler_utils import upscale_with_model
@@ -20,6 +20,7 @@ class UpscalerHAT(Upscaler):
self.scalers.append(scaler_data)
def do_upscale(self, img, selected_model):
prepare_free_memory()
try:
model = self.load_model(selected_model)
except Exception as e:

View File

@@ -2,7 +2,7 @@ import os
from modules import modelloader, errors
from modules.shared import cmd_opts, opts
from modules.upscaler import Upscaler, UpscalerData
from modules.upscaler import Upscaler, UpscalerData, prepare_free_memory
from modules.upscaler_utils import upscale_with_model
@@ -27,6 +27,8 @@ class UpscalerRealESRGAN(Upscaler):
self.scalers.append(scaler)
def do_upscale(self, img, path):
prepare_free_memory()
if not self.enable:
return img