From 42f390d730d1d8f7b22294e209961d66717e727c Mon Sep 17 00:00:00 2001 From: wangna11BD <79366697+wangna11BD@users.noreply.github.com> Date: Tue, 19 Oct 2021 15:14:48 +0800 Subject: [PATCH] fix edvr (#446) --- ppgan/models/generators/edvr.py | 23 ++-- ppgan/models/generators/mpr.py | 12 +- ppgan/modules/dcn.py | 194 -------------------------------- 3 files changed, 13 insertions(+), 216 deletions(-) delete mode 100644 ppgan/modules/dcn.py diff --git a/ppgan/models/generators/edvr.py b/ppgan/models/generators/edvr.py index be3932a..1a57839 100644 --- a/ppgan/models/generators/edvr.py +++ b/ppgan/models/generators/edvr.py @@ -12,15 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle - import numpy as np +import paddle import paddle.nn as nn -from ...modules.init import kaiming_normal_, constant_, constant_init +from paddle.vision.ops import DeformConv2D -from ...modules.dcn import DeformableConv_dygraph -# from paddle.vision.ops import DeformConv2D #to be compiled +from ...modules.init import kaiming_normal_, constant_, constant_init from .builder import GENERATORS @@ -373,14 +371,13 @@ class DCNPack(nn.Layer): self.total_channels = self.deformable_groups * 3 * self.kernel_size[ 0] * self.kernel_size[1] self.split_channels = self.total_channels // 3 - self.dcn = DeformableConv_dygraph( - num_filters=self.num_filters, - filter_size=self.kernel_size, - dilation=dilation, - stride=stride, - padding=padding, - deformable_groups=self.deformable_groups) - # self.dcn = DeformConv2D(in_channels=self.num_filters,out_channels=self.num_filters,kernel_size=self.kernel_size,stride=stride,padding=padding,dilation=dilation,deformable_groups=self.deformable_groups,groups=1) # to be compiled + self.dcn = DeformConv2D(in_channels=self.num_filters, + out_channels=self.num_filters, + kernel_size=self.kernel_size, + stride=stride, + padding=padding, + dilation=dilation, + deformable_groups=self.deformable_groups) self.sigmoid = nn.Sigmoid() # init conv offset constant_init(self.conv_offset_mask, 0., 0.) diff --git a/ppgan/models/generators/mpr.py b/ppgan/models/generators/mpr.py index 51b3f07..7f06bcd 100644 --- a/ppgan/models/generators/mpr.py +++ b/ppgan/models/generators/mpr.py @@ -12,22 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle - import numpy as np +import paddle import paddle.nn as nn -from ...modules.init import kaiming_normal_, constant_ +import paddle.nn.functional as F -from ...modules.dcn import DeformableConv_dygraph -# from paddle.vision.ops import DeformConv2D #to be compiled +from ...modules.init import kaiming_normal_, constant_ from .builder import GENERATORS -import paddle -from paddle import nn -import paddle.nn.functional as F - ########################################################################## def conv(in_channels, out_channels, kernel_size, bias_attr=False, stride=1): diff --git a/ppgan/modules/dcn.py b/ppgan/modules/dcn.py deleted file mode 100644 index 62c6493..0000000 --- a/ppgan/modules/dcn.py +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserve. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import math -import numpy as np -import paddle -from paddle.fluid.layer_helper import LayerHelper -from paddle.fluid.data_feeder import check_variable_and_dtype, check_type, check_dtype -from paddle.fluid.layers import deformable_conv -from paddle.fluid import core, layers -from paddle.fluid.layers import nn, utils -from paddle.nn import Layer -from paddle.fluid.initializer import Normal -from paddle.common_ops_import import * -from .init import uniform_, constant_ - - -class DeformConv2D(Layer): - def __init__(self, - in_channels, - out_channels, - kernel_size, - stride=1, - padding=0, - dilation=1, - deformable_groups=1, - groups=1, - weight_attr=None, - bias_attr=None): - super(DeformConv2D, self).__init__() - assert weight_attr is not False, "weight_attr should not be False in Conv." - self._weight_attr = weight_attr - self._bias_attr = bias_attr - self._deformable_groups = deformable_groups - self._groups = groups - self._in_channels = in_channels - self._out_channels = out_channels - self.padding = padding - self.stride = stride - self._channel_dim = 1 - - self._stride = utils.convert_to_list(stride, 2, 'stride') - self._dilation = utils.convert_to_list(dilation, 2, 'dilation') - self._kernel_size = utils.convert_to_list(kernel_size, 2, 'kernel_size') - - if in_channels % groups != 0: - raise ValueError("in_channels must be divisible by groups.") - - self._padding = utils.convert_to_list(padding, 2, 'padding') - - filter_shape = [out_channels, in_channels // groups] + self._kernel_size - - def _get_default_param_initializer(): - filter_elem_num = np.prod(self._kernel_size) * self._in_channels - std = (2.0 / filter_elem_num)**0.5 - return Normal(0.0, std, 0) - - self.weight = self.create_parameter( - shape=filter_shape, - attr=self._weight_attr, - default_initializer=_get_default_param_initializer()) - - self.bias = self.create_parameter(attr=self._bias_attr, - shape=[self._out_channels], - is_bias=True) - - self.init_weight() - - def init_weight(self): - n = self._in_channels - for k in self._kernel_size: - n *= k - stdv = 1. / math.sqrt(n) - uniform_(self.weight, -stdv, stdv) - if hasattr(self, 'bias') and self.bias is not None: - constant_(self.bias, 0.) - - def forward(self, x, offset, mask): - out = deform_conv2d( - x=x, - offset=offset, - mask=mask, - weight=self.weight, - bias=self.bias, - stride=self._stride, - padding=self._padding, - dilation=self._dilation, - deformable_groups=self._deformable_groups, - groups=self._groups, - ) - return out - - -def deform_conv2d(x, - offset, - weight, - mask, - bias=None, - stride=1, - padding=0, - dilation=1, - deformable_groups=1, - groups=1, - name=None): - - stride = utils.convert_to_list(stride, 2, 'stride') - padding = utils.convert_to_list(padding, 2, 'padding') - dilation = utils.convert_to_list(dilation, 2, 'dilation') - - use_deform_conv2d_v1 = True if mask is None else False - - if in_dygraph_mode(): - attrs = ('strides', stride, 'paddings', padding, 'dilations', dilation, - 'deformable_groups', deformable_groups, 'groups', groups, - 'im2col_step', 1) - if use_deform_conv2d_v1: - op_type = 'deformable_conv_v1' - pre_bias = getattr(core.ops, op_type)(x, offset, weight, *attrs) - else: - op_type = 'deformable_conv' - pre_bias = getattr(core.ops, op_type)(x, offset, mask, weight, - *attrs) - if bias is not None: - out = nn.elementwise_add(pre_bias, bias, axis=1) - else: - out = pre_bias - else: - helper = LayerHelper('deform_conv2d', **locals()) - attrs = {'strides': stride, 'paddings': padding, 'dilations': dilation, 'deformable_groups': deformable_groups, - 'groups': groups, 'im2col_step': 1} - if use_deform_conv2d_v1: - op_type = 'deformable_conv_v1' - inputs = {'Input': x, 'Offset': offset, 'Filter': weight} - else: - op_type = 'deformable_conv' - inputs = {'Input': x, 'Offset': offset, - 'Mask': mask, 'Filter': weight} - - pre_bias = helper.create_variable_for_type_inference(dtype=x.dtype) - helper.append_op(type=op_type, inputs=inputs, outputs={ - 'Output': pre_bias}, attrs=attrs) - - if bias is not None: - out = nn.elementwise_add(pre_bias, bias, axis=1) - else: - out = pre_bias - return out - - -class DeformableConv_dygraph(Layer): - def __init__(self, - num_filters, - filter_size, - dilation, - stride, - padding, - deformable_groups=1, - groups=1): - super(DeformableConv_dygraph, self).__init__() - self.num_filters = num_filters - self.filter_size = filter_size - self.dilation = dilation - self.stride = stride - self.padding = padding - self.deformable_groups = deformable_groups - self.groups = groups - self.defor_conv = DeformConv2D(in_channels=self.num_filters, - out_channels=self.num_filters, - kernel_size=self.filter_size, - stride=self.stride, - padding=self.padding, - dilation=self.dilation, - deformable_groups=self.deformable_groups, - groups=self.groups, - weight_attr=None, - bias_attr=None) - - def forward(self, *input): - x = input[0] - offset = input[1] - mask = input[2] - out = self.defor_conv(x, offset, mask) - return out -- GitLab