diff --git a/paddle/operators/math/unpooling.cc b/paddle/operators/math/unpooling.cc index a3a24a68929755b0769e6e1c65b34564a6fac850..d8647c6b236dfc79000f3b8d35efe662b08003f9 100644 --- a/paddle/operators/math/unpooling.cc +++ b/paddle/operators/math/unpooling.cc @@ -60,9 +60,9 @@ public: void operator()(const platform::DeviceContext& context, const framework::Tensor& input, const framework::Tensor& indices, - framework::Tensor * input_grad, const framework::Tensor& output, - const framework::Tensor& output_grad) { + const framework::Tensor& output_grad, + framework::Tensor * input_grad) { const int batch_size = input.dims()[0]; const int input_height = input.dims()[2]; const int input_width = input.dims()[3]; diff --git a/paddle/operators/math/unpooling.cu b/paddle/operators/math/unpooling.cu index 358847b315c69df5d1df84d8c912dbf532b4add9..d3eaa48547ee381ed48434058482e255f287ca4c 100644 --- a/paddle/operators/math/unpooling.cu +++ b/paddle/operators/math/unpooling.cu @@ -114,9 +114,9 @@ class Unpool2dMaxGradFunctor { void operator()(const platform::DeviceContext& context, const framework::Tensor& input, const framework::Tensor& indices, - framework::Tensor * input_grad, const framework::Tensor& output, - const framework::Tensor& output_grad) { + const framework::Tensor& output_grad, + framework::Tensor * input_grad) { const int batch_size = input.dims()[0]; const int input_height = input.dims()[2]; const int input_width = input.dims()[3]; diff --git a/paddle/operators/math/unpooling.h b/paddle/operators/math/unpooling.h index 88e88ba117d22e466f6e480f30e8bdf04e925641..bf79354ed927017e0ad802cfca832a3295c7309f 100644 --- a/paddle/operators/math/unpooling.h +++ b/paddle/operators/math/unpooling.h @@ -14,8 +14,6 @@ limitations under the License. */ #pragma once #include "paddle/framework/tensor.h" -#include "paddle/platform/device_context.h" -#include "paddle/platform/hostdevice.h" namespace paddle { namespace operators { @@ -37,9 +35,9 @@ class Unpool2dMaxGradFunctor { void operator()(const platform::DeviceContext& context, const framework::Tensor& input, const framework::Tensor& indices, - framework::Tensor * input_grad, const framework::Tensor& output, - const framework::Tensor& output_grad); + const framework::Tensor& output_grad, + framework::Tensor * input_grad); }; } // namespace math } // namespace operators diff --git a/paddle/operators/unpool_op.cc b/paddle/operators/unpool_op.cc index b5f3d56e9605346e98d4ff2ca7f16978ec7760bd..ada9ce8ce5debb74b5500ee97839fd35707268d7 100644 --- a/paddle/operators/unpool_op.cc +++ b/paddle/operators/unpool_op.cc @@ -78,7 +78,7 @@ class UnpoolOp : public framework::OperatorWithKernel { auto in_x_dims = ctx->GetInputDim("X"); auto in_y_dims = ctx->GetInputDim("Y"); - std::string unpoolingtype = + std::string unpooling_type = ctx->Attrs().Get("unpoolingtype"); std::vector ksize = ctx->Attrs().Get>("ksize"); std::vector strides = ctx->Attrs().Get>("strides");