From 0397b609b37750ed671264f63bd7bafd29277f0d Mon Sep 17 00:00:00 2001 From: jiangjinsheng Date: Thu, 16 Jul 2020 12:09:48 +0800 Subject: [PATCH] fixed Conv1dTranspose --- mindspore/nn/layer/conv.py | 6 +++--- mindspore/nn/layer/pooling.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mindspore/nn/layer/conv.py b/mindspore/nn/layer/conv.py index fc837f60eb..77c6ace75d 100644 --- a/mindspore/nn/layer/conv.py +++ b/mindspore/nn/layer/conv.py @@ -742,10 +742,10 @@ class Conv1dTranspose(_Conv): self.padding[0] + self.padding[1]) w_out = self._deconv_output_length(w, self.kernel_size[1], self.stride[1], self.dilation[1], self.padding[2] + self.padding[3]) - if self.has_bias: - return self.bias_add(self.conv2d_transpose(x, self.weight, (n, self.out_channels, h_out, w_out)), - self.bias) output = self.conv2d_transpose(x, self.weight, (n, self.out_channels, h_out, w_out)) + if self.has_bias: + output = self.bias_add(output, self.bias) + if len(x_shape) == 3: output = self.squeeze(output) return output diff --git a/mindspore/nn/layer/pooling.py b/mindspore/nn/layer/pooling.py index 6c26fcea67..1277dc9e35 100644 --- a/mindspore/nn/layer/pooling.py +++ b/mindspore/nn/layer/pooling.py @@ -283,6 +283,7 @@ class AvgPool1d(_PoolNd): self.reduce_mean = P.ReduceMean(keep_dims=True) self.slice = P.Slice() self.expand = P.ExpandDims() + self.squeeze = P.Squeeze(2) def construct(self, x): _shape_check(self.shape(x)) @@ -295,4 +296,5 @@ class AvgPool1d(_PoolNd): else: x = self.expand(x, 2) x = self.avg_pool(x) + x = self.squeeze(x) return x