From 31187e7e7265f67e3b2ca67900b07242ad443b68 Mon Sep 17 00:00:00 2001 From: zchen0211 Date: Wed, 1 Nov 2017 11:47:09 -0700 Subject: [PATCH] deconv fix --- ...nspose_cudnn_op.cc => conv2d_transpose_cudnn_op.cc} | 2 +- ...nspose_cudnn_op.cu => conv2d_transpose_cudnn_op.cu} | 2 +- .../{conv2dtranspose_op.cc => conv2d_transpose_op.cc} | 10 +++++----- .../{conv2dtranspose_op.cu => conv2d_transpose_op.cu} | 6 +++--- .../{conv2dtranspose_op.h => conv2d_transpose_op.h} | 2 +- ...nv2dtranspose_op.py => test_conv2d_transpose_op.py} | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename paddle/operators/{conv2dtranspose_cudnn_op.cc => conv2d_transpose_cudnn_op.cc} (97%) rename paddle/operators/{conv2dtranspose_cudnn_op.cu => conv2d_transpose_cudnn_op.cu} (99%) rename paddle/operators/{conv2dtranspose_op.cc => conv2d_transpose_op.cc} (95%) rename paddle/operators/{conv2dtranspose_op.cu => conv2d_transpose_op.cu} (89%) rename paddle/operators/{conv2dtranspose_op.h => conv2d_transpose_op.h} (99%) rename python/paddle/v2/framework/tests/{test_conv2dtranspose_op.py => test_conv2d_transpose_op.py} (98%) diff --git a/paddle/operators/conv2dtranspose_cudnn_op.cc b/paddle/operators/conv2d_transpose_cudnn_op.cc similarity index 97% rename from paddle/operators/conv2dtranspose_cudnn_op.cc rename to paddle/operators/conv2d_transpose_cudnn_op.cc index 4f05364550d..8ce94e0f04f 100644 --- a/paddle/operators/conv2dtranspose_cudnn_op.cc +++ b/paddle/operators/conv2d_transpose_cudnn_op.cc @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -#include "paddle/operators/conv2dtranspose_op.h" +#include "paddle/operators/conv2d_transpose_op.h" namespace paddle { namespace operators { diff --git a/paddle/operators/conv2dtranspose_cudnn_op.cu b/paddle/operators/conv2d_transpose_cudnn_op.cu similarity index 99% rename from paddle/operators/conv2dtranspose_cudnn_op.cu rename to paddle/operators/conv2d_transpose_cudnn_op.cu index 1ec370a556c..3844d9ad256 100644 --- a/paddle/operators/conv2dtranspose_cudnn_op.cu +++ b/paddle/operators/conv2d_transpose_cudnn_op.cu @@ -15,7 +15,7 @@ #include "paddle/framework/eigen.h" #include "paddle/framework/op_registry.h" #include "paddle/memory/memory.h" -#include "paddle/operators/conv2dtranspose_op.h" +#include "paddle/operators/conv2d_transpose_op.h" #include "paddle/platform/assert.h" #include "paddle/platform/cudnn_helper.h" diff --git a/paddle/operators/conv2dtranspose_op.cc b/paddle/operators/conv2d_transpose_op.cc similarity index 95% rename from paddle/operators/conv2dtranspose_op.cc rename to paddle/operators/conv2d_transpose_op.cc index c1b231906e2..348527728bd 100644 --- a/paddle/operators/conv2dtranspose_op.cc +++ b/paddle/operators/conv2d_transpose_op.cc @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -#include "paddle/operators/conv2dtranspose_op.h" +#include "paddle/operators/conv2d_transpose_op.h" namespace paddle { namespace operators { @@ -95,13 +95,13 @@ void Conv2DTransposeOpGrad::InferShape( } // namespace paddle namespace ops = paddle::operators; -REGISTER_OP(conv2dtranspose, ops::Conv2DTransposeOp, - ops::Conv2DTransposeOpMaker, conv2dtranspose_grad, +REGISTER_OP(conv2d_transpose, ops::Conv2DTransposeOp, + ops::Conv2DTransposeOpMaker, conv2d_transpose_grad, ops::Conv2DTransposeOpGrad); REGISTER_OP_CPU_KERNEL( - conv2dtranspose, + conv2d_transpose, ops::GemmConv2DTransposeKernel); REGISTER_OP_CPU_KERNEL( - conv2dtranspose_grad, + conv2d_transpose_grad, ops::GemmConv2DTransposeGradKernel); diff --git a/paddle/operators/conv2dtranspose_op.cu b/paddle/operators/conv2d_transpose_op.cu similarity index 89% rename from paddle/operators/conv2dtranspose_op.cu rename to paddle/operators/conv2d_transpose_op.cu index 761bc1959e6..931ac9eed29 100644 --- a/paddle/operators/conv2dtranspose_op.cu +++ b/paddle/operators/conv2d_transpose_op.cu @@ -12,13 +12,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -#include "paddle/operators/conv2dtranspose_op.h" +#include "paddle/operators/conv2d_transpose_op.h" namespace ops = paddle::operators; REGISTER_OP_GPU_KERNEL( - conv2dtranspose, + conv2d_transpose, ops::GemmConv2DTransposeKernel); REGISTER_OP_GPU_KERNEL( - conv2dtranspose_grad, + conv2d_transpose_grad, ops::GemmConv2DTransposeGradKernel); diff --git a/paddle/operators/conv2dtranspose_op.h b/paddle/operators/conv2d_transpose_op.h similarity index 99% rename from paddle/operators/conv2dtranspose_op.h rename to paddle/operators/conv2d_transpose_op.h index 8c70b3dcec1..cab77882276 100644 --- a/paddle/operators/conv2dtranspose_op.h +++ b/paddle/operators/conv2d_transpose_op.h @@ -62,7 +62,7 @@ class GemmConv2DTransposeKernel : public framework::OpKernel { std::vector strides = context.Attr>("strides"); // TODO(Zhuoyuan): Paddings can be added in future. - // groups will alway be disabled in conv2dtranspose. + // groups will alway be disabled in conv2d_transpose. const int batch_size = input->dims()[0]; const int m = input->dims()[1]; diff --git a/python/paddle/v2/framework/tests/test_conv2dtranspose_op.py b/python/paddle/v2/framework/tests/test_conv2d_transpose_op.py similarity index 98% rename from python/paddle/v2/framework/tests/test_conv2dtranspose_op.py rename to python/paddle/v2/framework/tests/test_conv2d_transpose_op.py index 07443708133..999a0bdc629 100644 --- a/python/paddle/v2/framework/tests/test_conv2dtranspose_op.py +++ b/python/paddle/v2/framework/tests/test_conv2d_transpose_op.py @@ -67,7 +67,7 @@ class TestConv2dTransposeOp(OpTest): self.filter_size = [f_c, 6, 3, 3] def init_op_type(self): - self.op_type = "conv2dtranspose" + self.op_type = "conv2d_transpose" def test_check_grad_no_input(self): self.check_grad( -- GitLab