diff --git a/src/operators/fusion_conv_add_add_prelu_op.h b/src/operators/fusion_conv_add_add_prelu_op.h index 2bf4c39c5ec916b78471d921fa28694d3117d283..4ec76b500812f95eb64e27564d0e63b2c1b2c2d3 100644 --- a/src/operators/fusion_conv_add_add_prelu_op.h +++ b/src/operators/fusion_conv_add_add_prelu_op.h @@ -17,8 +17,8 @@ limitations under the License. */ #pragma once #include -#include #include +#include #include "framework/operator.h" #include "framework/program/program-optimize/fusion_op_register.h" #include "operators/kernel/conv_add_add_prelu_kernel.h" diff --git a/src/operators/fusion_conv_add_op.h b/src/operators/fusion_conv_add_op.h index 843a744aca1f3e57e0962791bc84c7de9dc988ea..eef143ce8716ce856784bb01dd3d58a26746b4e8 100644 --- a/src/operators/fusion_conv_add_op.h +++ b/src/operators/fusion_conv_add_op.h @@ -19,8 +19,8 @@ limitations under the License. */ #include #include "framework/operator.h" #include "framework/program/program-optimize/fusion_op_register.h" -#include "operators/op_param.h" #include "operators/kernel/conv_add_kernel.h" +#include "operators/op_param.h" namespace paddle_mobile { namespace operators { diff --git a/src/operators/fusion_conv_add_prelu_op.h b/src/operators/fusion_conv_add_prelu_op.h index 2139cdec8f7d0f048c3a7a782a6269780ed0f67d..fc1143099e16b8b7f7c44d7fe5a5694a278a1906 100644 --- a/src/operators/fusion_conv_add_prelu_op.h +++ b/src/operators/fusion_conv_add_prelu_op.h @@ -39,8 +39,7 @@ class FusionConvAddPReluOpMatcher : public framework::FusionOpMatcher { std::vector> *removed_nodes) { node->Folder(node_.Depth(), Type(), {{G_OP_TYPE_ELEMENTWISE_ADD, {{"Y", "Y"}}}, - {G_OP_TYPE_PRELU, {{"Alpha", "Alpha"}}} - }, + {G_OP_TYPE_PRELU, {{"Alpha", "Alpha"}}}}, removed_nodes); } std::string Type() { return G_OP_TYPE_FUSION_CONV_ADD_PRELU; } diff --git a/src/operators/fusion_conv_bn_add_relu_op.h b/src/operators/fusion_conv_bn_add_relu_op.h index 84d93a3772ac78800ad2124d534f1ee5ae0d76f9..303668a89bf7869e72a4b546c5d96be24b26c4ec 100644 --- a/src/operators/fusion_conv_bn_add_relu_op.h +++ b/src/operators/fusion_conv_bn_add_relu_op.h @@ -17,12 +17,12 @@ limitations under the License. */ #pragma once #include -#include #include +#include #include "framework/operator.h" #include "framework/program/program-optimize/fusion_op_register.h" -#include "operators/op_param.h" #include "operators/kernel/conv_bn_add_relu_kernel.h" +#include "operators/op_param.h" namespace paddle_mobile { namespace operators { diff --git a/src/operators/fusion_dwconv_bn_relu_op.h b/src/operators/fusion_dwconv_bn_relu_op.h index 119f57ce04fa738090a4e2eb16d0b44cec54d2c6..d7a74d896e904971e21c28fab29771b34a049921 100644 --- a/src/operators/fusion_dwconv_bn_relu_op.h +++ b/src/operators/fusion_dwconv_bn_relu_op.h @@ -20,8 +20,8 @@ limitations under the License. */ #include #include "framework/operator.h" #include "framework/program/program-optimize/fusion_op_register.h" -#include "operators/op_param.h" #include "operators/kernel/dwconv_bn_relu_kernel.h" +#include "operators/op_param.h" namespace paddle_mobile { namespace operators { diff --git a/src/operators/im2sequence_op.h b/src/operators/im2sequence_op.h index a2b34a5eea3bc496ba51c4f066f92ce011a6dc91..036b496ca8293432aa30ae86542e78880143f086 100644 --- a/src/operators/im2sequence_op.h +++ b/src/operators/im2sequence_op.h @@ -17,9 +17,9 @@ limitations under the License. */ #pragma once #include -#include "operators/op_param.h" #include "framework/operator.h" #include "operators/kernel/im2sequence_kernel.h" +#include "operators/op_param.h" namespace paddle_mobile { namespace operators { diff --git a/src/operators/kernel/cl/elementwise_add_kernel.cpp b/src/operators/kernel/cl/elementwise_add_kernel.cpp index 970accc1dc658fe20434375537258f0e12e18621..e62714b3fa3182706270627e7fd1a13b06f3b66a 100644 --- a/src/operators/kernel/cl/elementwise_add_kernel.cpp +++ b/src/operators/kernel/cl/elementwise_add_kernel.cpp @@ -49,11 +49,14 @@ void ElementwiseAddKernel::Compute( cl_mem input_image = input->GetCLImage(); cl_mem bias_image = bias->GetCLImage(); cl_mem output_image = output->GetCLImage(); - status = clSetKernelArg(kernel, 0, sizeof(cl_mem), reinterpret_cast(&input_image)); + status = clSetKernelArg(kernel, 0, sizeof(cl_mem), + reinterpret_cast(&input_image)); CL_CHECK_ERRORS(status); - status = clSetKernelArg(kernel, 1, sizeof(cl_mem), reinterpret_cast(&bias_image)); + status = clSetKernelArg(kernel, 1, sizeof(cl_mem), + reinterpret_cast(&bias_image)); CL_CHECK_ERRORS(status); - status = clSetKernelArg(kernel, 2, sizeof(cl_mem), reinterpret_cast(&output_image)); + status = clSetKernelArg(kernel, 2, sizeof(cl_mem), + reinterpret_cast(&output_image)); CL_CHECK_ERRORS(status); int width = input->ImageWidth(); int height = input->ImageHeight(); @@ -67,13 +70,17 @@ void ElementwiseAddKernel::Compute( cl_mem bias_image = bias->GetCLImage(); cl_mem output_image = output->GetCLImage(); int tensor_w = input->dims()[3]; - status = clSetKernelArg(kernel, 0, sizeof(cl_mem), reinterpret_cast(&input_image)); + status = clSetKernelArg(kernel, 0, sizeof(cl_mem), + reinterpret_cast(&input_image)); CL_CHECK_ERRORS(status); - status = clSetKernelArg(kernel, 1, sizeof(cl_mem), reinterpret_cast(&bias_image)); + status = clSetKernelArg(kernel, 1, sizeof(cl_mem), + reinterpret_cast(&bias_image)); CL_CHECK_ERRORS(status); - status = clSetKernelArg(kernel, 2, sizeof(cl_mem), reinterpret_cast(&output_image)); + status = clSetKernelArg(kernel, 2, sizeof(cl_mem), + reinterpret_cast(&output_image)); CL_CHECK_ERRORS(status); - status = clSetKernelArg(kernel, 3, sizeof(cl_int), reinterpret_cast(&tensor_w)); + status = clSetKernelArg(kernel, 3, sizeof(cl_int), + reinterpret_cast(&tensor_w)); CL_CHECK_ERRORS(status); int width = input->ImageWidth(); int height = input->ImageHeight(); diff --git a/src/operators/pool_op.cpp b/src/operators/pool_op.cpp index 1ee75ebea5a7564fa91735c71e270f4c822a0ff3..241f278ec0c5dd10e103b3ab1aa6f296323eebce 100644 --- a/src/operators/pool_op.cpp +++ b/src/operators/pool_op.cpp @@ -14,8 +14,8 @@ limitations under the License. */ #ifdef POOL_OP -#include #include "operators/pool_op.h" +#include #include "framework/op_proto_maker.h" #include "framework/op_registry.h"