diff --git a/src/operators/fusion_conv_add.h b/src/operators/fusion_conv_add.h index 5b897927090b202f4f7466477df5f1bdf8b3636e..f0a3ea17d9a86e2c8638c164cfa2bf21d4fb727d 100644 --- a/src/operators/fusion_conv_add.h +++ b/src/operators/fusion_conv_add.h @@ -48,13 +48,13 @@ class FusionConvAddMatcher : public framework::FusionOpMatcher { template class FusionConvAddOp : public framework::OperatorWithKernel< - DeviceType, FusionConvAddParam, - operators::ConvAddKernel> { + DeviceType, FusionConvAddParam, + operators::ConvAddKernel> { public: FusionConvAddOp(const string &type, const VariableNameMap &inputs, - const VariableNameMap &outputs, - const framework::AttributeMap &attrs, - std::shared_ptr scope) + const VariableNameMap &outputs, + const framework::AttributeMap &attrs, + std::shared_ptr scope) : framework::OperatorWithKernel>( type, inputs, outputs, attrs, scope) {} diff --git a/src/operators/fusion_fc_op.h b/src/operators/fusion_fc_op.h index f593b953d4ab2e6b4e16e25cf31698862260d02b..2035704bb60eb96bfb22fc4f277d30817efcf646 100644 --- a/src/operators/fusion_fc_op.h +++ b/src/operators/fusion_fc_op.h @@ -45,18 +45,17 @@ class FusionFcMatcher : public framework::FusionOpMatcher { }; template -class FusionFcOp : public framework::OperatorWithKernel< - DeviceType, FusionFcParam, - operators::FusionFcKernel> { +class FusionFcOp + : public framework::OperatorWithKernel< + DeviceType, FusionFcParam, operators::FusionFcKernel> { public: FusionFcOp(const string &type, const VariableNameMap &inputs, - const VariableNameMap &outputs, - const framework::AttributeMap &attrs, - std::shared_ptr scope) - : framework::OperatorWithKernel< - DeviceType, FusionFcParam, - operators::FusionFcKernel>(type, inputs, outputs, - attrs, scope) {} + const VariableNameMap &outputs, + const framework::AttributeMap &attrs, + std::shared_ptr scope) + : framework::OperatorWithKernel>( + type, inputs, outputs, attrs, scope) {} using framework::OperatorWithKernel< DeviceType, FusionFcParam, diff --git a/src/operators/kernel/arm/conv_add_kernel.cpp b/src/operators/kernel/arm/conv_add_kernel.cpp index 5f64675e79c0233cde855334f69477c750ed5fbb..1cb61b03dc1d011f45a802eb002824d4bb9f5352 100644 --- a/src/operators/kernel/arm/conv_add_kernel.cpp +++ b/src/operators/kernel/arm/conv_add_kernel.cpp @@ -19,8 +19,7 @@ namespace paddle_mobile { namespace operators { template <> -void ConvAddKernel::Compute( - const FusionConvAddParam ¶m) const { +void ConvAddKernel::Compute(const FusionConvAddParam ¶m) const { const Tensor *input = param.Input(); Tensor filter = *param.Filter(); Tensor bias = *param.Bias(); diff --git a/src/operators/op_param.h b/src/operators/op_param.h index 3e18564e2dd4557c82936f33ed3c691ce4ffc250..ad7de0ee44db3a727ec06d5fabfca203226215f4 100644 --- a/src/operators/op_param.h +++ b/src/operators/op_param.h @@ -755,7 +755,7 @@ class ReluParam : public OpParam { class FusionFcParam : public OpParam { public: FusionFcParam(const VariableNameMap &inputs, const VariableNameMap &outputs, - const AttributeMap &attrs, const Scope &scope) { + const AttributeMap &attrs, const Scope &scope) { input_x_ = InputXFrom(inputs, scope); input_y_ = InputYFrom(inputs, scope); input_z_ = InputZFrom(inputs, scope); @@ -793,8 +793,8 @@ class FusionFcParam : public OpParam { class FusionConvAddParam : public OpParam { public: FusionConvAddParam(const VariableNameMap &inputs, - const VariableNameMap &outputs, const AttributeMap &attrs, - const Scope &scope) { + const VariableNameMap &outputs, const AttributeMap &attrs, + const Scope &scope) { bias_ = InputYFrom(inputs, scope); axis_ = GetAttr("axis", attrs); filter_ = FilterFrom(inputs, scope); @@ -842,8 +842,8 @@ Print &operator<<(Print &printer, const FusionConvAddParam &conv_param); class FusionConvAddReluParam : public FusionConvAddParam { public: FusionConvAddReluParam(const VariableNameMap &inputs, - const VariableNameMap &outputs, - const AttributeMap &attrs, const Scope &scope) + const VariableNameMap &outputs, + const AttributeMap &attrs, const Scope &scope) : FusionConvAddParam(inputs, outputs, attrs, scope) {} }; #endif