Merge branch 'dev' into reorder-hotkeys

1 files changed, 4 insertions, 3 deletions

diff --git a/modules/esrgan_model_arch.py b/modules/esrgan_model_arch.py
index 6071fea7..2b9888ba 100644
--- a/modules/esrgan_model_arch.py
+++ b/modules/esrgan_model_arch.py
@@ -2,7 +2,6 @@
 

 from collections import OrderedDict

 import math

-import functools

 import torch

 import torch.nn as nn

 import torch.nn.functional as F

@@ -106,7 +105,7 @@ class ResidualDenseBlock_5C(nn.Module):
     Modified options that can be used:

         - "Partial Convolution based Padding" arXiv:1811.11718

         - "Spectral normalization" arXiv:1802.05957

-        - "ICASSP 2020 - ESRGAN+ : Further Improving ESRGAN" N. C. 

+        - "ICASSP 2020 - ESRGAN+ : Further Improving ESRGAN" N. C.

             {Rakotonirina} and A. {Rasoanaivo}

     """

 

@@ -171,7 +170,7 @@ class GaussianNoise(nn.Module):
             scale = self.sigma * x.detach() if self.is_relative_detach else self.sigma * x

             sampled_noise = self.noise.repeat(*x.size()).normal_() * scale

             x = x + sampled_noise

-        return x 

+        return x

 

 def conv1x1(in_planes, out_planes, stride=1):

     return nn.Conv2d(in_planes, out_planes, kernel_size=1, stride=stride, bias=False)

@@ -438,9 +437,11 @@ def conv_block(in_nc, out_nc, kernel_size, stride=1, dilation=1, groups=1, bias=
     padding = padding if pad_type == 'zero' else 0

 

     if convtype=='PartialConv2D':

+        from torchvision.ops import PartialConv2d  # this is definitely not going to work, but PartialConv2d doesn't work anyway and this shuts up static analyzer

         c = PartialConv2d(in_nc, out_nc, kernel_size=kernel_size, stride=stride, padding=padding,

                dilation=dilation, bias=bias, groups=groups)

     elif convtype=='DeformConv2D':

+        from torchvision.ops import DeformConv2d  # not tested

         c = DeformConv2d(in_nc, out_nc, kernel_size=kernel_size, stride=stride, padding=padding,

                dilation=dilation, bias=bias, groups=groups)

     elif convtype=='Conv3D':