From 6d483034515990dcbaf5023e4596882818c79ade Mon Sep 17 00:00:00 2001 From: liuruilong Date: Wed, 20 Jun 2018 17:36:06 +0800 Subject: [PATCH] correct typos --- .../program-optimize/program_optimize.cpp | 2 +- .../program-optimize/program_optimize.h | 2 +- src/io/io.cpp | 2 +- src/operators/fusion_conv_add.cpp | 6 +++--- src/operators/fusion_conv_add.h | 10 +++++----- src/operators/fusion_conv_add_relu_op.h | 12 ++++++------ src/operators/fusion_fc_op.cpp | 6 +++--- src/operators/fusion_fc_op.h | 18 +++++++++--------- src/operators/kernel/arm/conv_add_kernel.cpp | 2 +- .../kernel/arm/conv_add_relu_kernel.cpp | 2 +- ...hion_fc_kernel.cpp => fusion_fc_kernel.cpp} | 4 ++-- src/operators/kernel/conv_add_kernel.h | 4 ++-- src/operators/kernel/conv_add_relu_kernel.h | 4 ++-- ...{fushion_fc_kernel.h => fusion_fc_kernel.h} | 6 +++--- src/operators/op_param.cpp | 2 +- src/operators/op_param.h | 16 ++++++++-------- test/CMakeLists.txt | 2 +- test/framework/test_optimize.cpp | 2 +- ...fushion_fc_op.cpp => test_fusion_fc_op.cpp} | 6 +++--- 19 files changed, 54 insertions(+), 54 deletions(-) rename src/operators/kernel/arm/{fushion_fc_kernel.cpp => fusion_fc_kernel.cpp} (94%) rename src/operators/kernel/{fushion_fc_kernel.h => fusion_fc_kernel.h} (86%) rename test/operators/{test_fushion_fc_op.cpp => test_fusion_fc_op.cpp} (96%) diff --git a/src/framework/program/program-optimize/program_optimize.cpp b/src/framework/program/program-optimize/program_optimize.cpp index 2e802b120a..e9b5cc5187 100644 --- a/src/framework/program/program-optimize/program_optimize.cpp +++ b/src/framework/program/program-optimize/program_optimize.cpp @@ -19,7 +19,7 @@ namespace paddle_mobile { namespace framework { -std::shared_ptr ProgramOptimize::FushionOptimize( +std::shared_ptr ProgramOptimize::FusionOptimize( std::shared_ptr ori_des, bool add_split) { // ProgramDesc *optimize_program = new ProgramDesc(*ori_des); std::shared_ptr optimize_program = diff --git a/src/framework/program/program-optimize/program_optimize.h b/src/framework/program/program-optimize/program_optimize.h index ae632da4bd..57b282926d 100644 --- a/src/framework/program/program-optimize/program_optimize.h +++ b/src/framework/program/program-optimize/program_optimize.h @@ -27,7 +27,7 @@ namespace framework { class ProgramOptimize { public: ProgramOptimize() {} - std::shared_ptr FushionOptimize( + std::shared_ptr FusionOptimize( std::shared_ptr ori_des, bool add_split = false); private: diff --git a/src/io/io.cpp b/src/io/io.cpp index 91f8c5727c..6317afc8c5 100644 --- a/src/io/io.cpp +++ b/src/io/io.cpp @@ -147,7 +147,7 @@ const framework::Program Loader::LoadProgram( if (optimize) { framework::ProgramOptimize program_optimize; program.optimizeProgram = - program_optimize.FushionOptimize(originProgramDesc, can_add_split); + program_optimize.FusionOptimize(originProgramDesc, can_add_split); } if (optimize) { program.optimizeProgram->Description("optimize: "); diff --git a/src/operators/fusion_conv_add.cpp b/src/operators/fusion_conv_add.cpp index 80682324f7..2605414c89 100644 --- a/src/operators/fusion_conv_add.cpp +++ b/src/operators/fusion_conv_add.cpp @@ -21,7 +21,7 @@ namespace paddle_mobile { namespace operators { template -void FushionConvAddOp::InferShape() const { +void FusionConvAddOp::InferShape() const { auto in_dims = this->param_.Input()->dims(); auto filter_dims = this->param_.Filter()->dims(); const std::vector &strides = this->param_.Strides(); @@ -44,14 +44,14 @@ void FushionConvAddOp::InferShape() const { framework::DDim ddim = framework::make_ddim(output_shape); this->param_.Output()->Resize(ddim); } -template class FushionConvAddOp; +template class FusionConvAddOp; } // namespace operators } // namespace paddle_mobile namespace ops = paddle_mobile::operators; #ifdef PADDLE_MOBILE_CPU USE_OP_CPU(conv_add); -REGISTER_OPERATOR_CPU(conv_add, ops::FushionConvAddOp); +REGISTER_OPERATOR_CPU(conv_add, ops::FusionConvAddOp); #endif #ifdef PADDLE_MOBILE_MALI_GPU #endif diff --git a/src/operators/fusion_conv_add.h b/src/operators/fusion_conv_add.h index 88ddd055b9..5b89792709 100644 --- a/src/operators/fusion_conv_add.h +++ b/src/operators/fusion_conv_add.h @@ -47,20 +47,20 @@ class FusionConvAddMatcher : public framework::FusionOpMatcher { }; template -class FushionConvAddOp : public framework::OperatorWithKernel< - DeviceType, FushionConvAddParam, +class FusionConvAddOp : public framework::OperatorWithKernel< + DeviceType, FusionConvAddParam, operators::ConvAddKernel> { public: - FushionConvAddOp(const string &type, const VariableNameMap &inputs, + FusionConvAddOp(const string &type, const VariableNameMap &inputs, const VariableNameMap &outputs, const framework::AttributeMap &attrs, std::shared_ptr scope) - : framework::OperatorWithKernel>( type, inputs, outputs, attrs, scope) {} using framework::OperatorWithKernel< - DeviceType, FushionConvAddParam, + DeviceType, FusionConvAddParam, operators::ConvAddKernel>::OperatorWithKernel; void InferShape() const override; diff --git a/src/operators/fusion_conv_add_relu_op.h b/src/operators/fusion_conv_add_relu_op.h index c19c92ef78..b87f1c4110 100644 --- a/src/operators/fusion_conv_add_relu_op.h +++ b/src/operators/fusion_conv_add_relu_op.h @@ -24,9 +24,9 @@ limitations under the License. */ namespace paddle_mobile { namespace operators { -class FushionConvAddReluOpMatcher : public framework::FusionOpMatcher { +class FusionConvAddReluOpMatcher : public framework::FusionOpMatcher { public: - FushionConvAddReluOpMatcher() { + FusionConvAddReluOpMatcher() { node_ = framework::Node(G_OP_TYPE_CONV); node_ > std::make_shared(G_OP_TYPE_ELEMENTWISE_ADD) > std::make_shared(G_OP_TYPE_RELU); @@ -43,7 +43,7 @@ class FushionConvAddReluOpMatcher : public framework::FusionOpMatcher { template class FusionConvAddReluOp : public framework::OperatorWithKernel< - DeviceType, FushionConvAddReluParam, + DeviceType, FusionConvAddReluParam, operators::ConvAddReluKernel> { public: FusionConvAddReluOp(const string &type, const VariableNameMap &inputs, @@ -51,12 +51,12 @@ class FusionConvAddReluOp : public framework::OperatorWithKernel< const framework::AttributeMap &attrs, std::shared_ptr scope) : framework::OperatorWithKernel< - DeviceType, FushionConvAddReluParam, + DeviceType, FusionConvAddReluParam, operators::ConvAddReluKernel>(type, inputs, outputs, attrs, scope) {} using framework::OperatorWithKernel< - DeviceType, FushionConvAddReluParam, + DeviceType, FusionConvAddReluParam, operators::ConvAddReluKernel>::OperatorWithKernel; void InferShape() const override; @@ -65,7 +65,7 @@ class FusionConvAddReluOp : public framework::OperatorWithKernel< #ifdef PADDLE_MOBILE_CPU // static framework::FusionOpRegistrar fusion_conv_add_relu_registrar(new -// FushionConvAddReluOpMatcher()); +// FusionConvAddReluOpMatcher()); #endif #ifdef PADDLE_MOBILE_MALI_GPU #endif diff --git a/src/operators/fusion_fc_op.cpp b/src/operators/fusion_fc_op.cpp index 65c1605a5d..2e4e098fd0 100644 --- a/src/operators/fusion_fc_op.cpp +++ b/src/operators/fusion_fc_op.cpp @@ -19,7 +19,7 @@ namespace paddle_mobile { namespace operators { template -void FushionFcOp::InferShape() const { +void FusionFcOp::InferShape() const { auto x_dims = this->param_.InputX()->dims(); auto y_dims = this->param_.InputY()->dims(); int x_num_col_dims = this->param_.XNumColDims(); @@ -49,14 +49,14 @@ void FushionFcOp::InferShape() const { framework::DDim ddim = framework::make_ddim(output_dims); this->param_.Out()->Resize(ddim); } -template class FushionFcOp; +template class FusionFcOp; } // namespace operators } // namespace paddle_mobile namespace ops = paddle_mobile::operators; #ifdef PADDLE_MOBILE_CPU USE_OP_CPU(fc); -REGISTER_OPERATOR_CPU(fc, ops::FushionFcOp); +REGISTER_OPERATOR_CPU(fc, ops::FusionFcOp); #endif #ifdef PADDLE_MOBILE_MALI_GPU #endif diff --git a/src/operators/fusion_fc_op.h b/src/operators/fusion_fc_op.h index 5e8ddc1425..f593b953d4 100644 --- a/src/operators/fusion_fc_op.h +++ b/src/operators/fusion_fc_op.h @@ -21,7 +21,7 @@ limitations under the License. */ #include "framework/operator.h" #include "framework/program/program-optimize/fusion_op_register.h" -#include "operators/kernel/fushion_fc_kernel.h" +#include "operators/kernel/fusion_fc_kernel.h" namespace paddle_mobile { namespace operators { @@ -45,22 +45,22 @@ class FusionFcMatcher : public framework::FusionOpMatcher { }; template -class FushionFcOp : public framework::OperatorWithKernel< - DeviceType, FushionFcParam, - operators::FushionFcKernel> { +class FusionFcOp : public framework::OperatorWithKernel< + DeviceType, FusionFcParam, + operators::FusionFcKernel> { public: - FushionFcOp(const string &type, const VariableNameMap &inputs, + FusionFcOp(const string &type, const VariableNameMap &inputs, const VariableNameMap &outputs, const framework::AttributeMap &attrs, std::shared_ptr scope) : framework::OperatorWithKernel< - DeviceType, FushionFcParam, - operators::FushionFcKernel>(type, inputs, outputs, + DeviceType, FusionFcParam, + operators::FusionFcKernel>(type, inputs, outputs, attrs, scope) {} using framework::OperatorWithKernel< - DeviceType, FushionFcParam, - operators::FushionFcKernel>::OperatorWithKernel; + DeviceType, FusionFcParam, + operators::FusionFcKernel>::OperatorWithKernel; void InferShape() const override; protected: diff --git a/src/operators/kernel/arm/conv_add_kernel.cpp b/src/operators/kernel/arm/conv_add_kernel.cpp index 4a669dc111..5f64675e79 100644 --- a/src/operators/kernel/arm/conv_add_kernel.cpp +++ b/src/operators/kernel/arm/conv_add_kernel.cpp @@ -20,7 +20,7 @@ namespace operators { template <> void ConvAddKernel::Compute( - const FushionConvAddParam ¶m) const { + const FusionConvAddParam ¶m) const { const Tensor *input = param.Input(); Tensor filter = *param.Filter(); Tensor bias = *param.Bias(); diff --git a/src/operators/kernel/arm/conv_add_relu_kernel.cpp b/src/operators/kernel/arm/conv_add_relu_kernel.cpp index a7141db7ec..2be08d5379 100644 --- a/src/operators/kernel/arm/conv_add_relu_kernel.cpp +++ b/src/operators/kernel/arm/conv_add_relu_kernel.cpp @@ -21,7 +21,7 @@ namespace operators { template <> void ConvAddReluKernel::Compute( - const FushionConvAddReluParam ¶m) const { + const FusionConvAddReluParam ¶m) const { const Tensor *input = param.Input(); Tensor filter = *param.Filter(); Tensor bias = *param.Bias(); diff --git a/src/operators/kernel/arm/fushion_fc_kernel.cpp b/src/operators/kernel/arm/fusion_fc_kernel.cpp similarity index 94% rename from src/operators/kernel/arm/fushion_fc_kernel.cpp rename to src/operators/kernel/arm/fusion_fc_kernel.cpp index ea88252c21..3cf6458fc7 100644 --- a/src/operators/kernel/arm/fushion_fc_kernel.cpp +++ b/src/operators/kernel/arm/fusion_fc_kernel.cpp @@ -16,13 +16,13 @@ limitations under the License. */ #pragma once -#include "operators/kernel/fushion_fc_kernel.h" +#include "operators/kernel/fusion_fc_kernel.h" namespace paddle_mobile { namespace operators { template <> -void FushionFcKernel::Compute(const FushionFcParam ¶m) const { +void FusionFcKernel::Compute(const FusionFcParam ¶m) const { const Tensor *input_x = param.InputX(); const Tensor *input_y = param.InputY(); const Tensor *input_z = param.InputZ(); diff --git a/src/operators/kernel/conv_add_kernel.h b/src/operators/kernel/conv_add_kernel.h index ab119e80c3..63086ea25f 100644 --- a/src/operators/kernel/conv_add_kernel.h +++ b/src/operators/kernel/conv_add_kernel.h @@ -35,9 +35,9 @@ using framework::DDim; using framework::OpKernelBase; template -class ConvAddKernel : public OpKernelBase { +class ConvAddKernel : public OpKernelBase { public: - void Compute(const FushionConvAddParam ¶m) const; + void Compute(const FusionConvAddParam ¶m) const; }; } // namespace operators diff --git a/src/operators/kernel/conv_add_relu_kernel.h b/src/operators/kernel/conv_add_relu_kernel.h index d2da6d30d2..ed2cc896f4 100644 --- a/src/operators/kernel/conv_add_relu_kernel.h +++ b/src/operators/kernel/conv_add_relu_kernel.h @@ -33,9 +33,9 @@ using framework::OpKernelBase; template class ConvAddReluKernel - : public OpKernelBase { + : public OpKernelBase { public: - void Compute(const FushionConvAddReluParam ¶m) const; + void Compute(const FusionConvAddReluParam ¶m) const; }; } // namespace operators diff --git a/src/operators/kernel/fushion_fc_kernel.h b/src/operators/kernel/fusion_fc_kernel.h similarity index 86% rename from src/operators/kernel/fushion_fc_kernel.h rename to src/operators/kernel/fusion_fc_kernel.h index aff8917664..cbb9721c7f 100644 --- a/src/operators/kernel/fushion_fc_kernel.h +++ b/src/operators/kernel/fusion_fc_kernel.h @@ -24,10 +24,10 @@ namespace paddle_mobile { namespace operators { template -class FushionFcKernel - : public framework::OpKernelBase { +class FusionFcKernel + : public framework::OpKernelBase { public: - void Compute(const FushionFcParam& param) const; + void Compute(const FusionFcParam& param) const; }; } // namespace operators } // namespace paddle_mobile diff --git a/src/operators/op_param.cpp b/src/operators/op_param.cpp index 1ec652ab8f..4ad7685731 100644 --- a/src/operators/op_param.cpp +++ b/src/operators/op_param.cpp @@ -41,7 +41,7 @@ Print &operator<<(Print &printer, const ConvParam &conv_param) { #ifdef FUSION_CONVADD_OP -Print &operator<<(Print &printer, const FushionConvAddParam &conv_param) { +Print &operator<<(Print &printer, const FusionConvAddParam &conv_param) { printer << "parameter of conv_add: " << "\n"; printer << " stride: " diff --git a/src/operators/op_param.h b/src/operators/op_param.h index 8d69ea1a2e..3e18564e2d 100644 --- a/src/operators/op_param.h +++ b/src/operators/op_param.h @@ -752,9 +752,9 @@ class ReluParam : public OpParam { #endif #ifdef FUSION_FC_OP -class FushionFcParam : public OpParam { +class FusionFcParam : public OpParam { public: - FushionFcParam(const VariableNameMap &inputs, const VariableNameMap &outputs, + FusionFcParam(const VariableNameMap &inputs, const VariableNameMap &outputs, const AttributeMap &attrs, const Scope &scope) { input_x_ = InputXFrom(inputs, scope); input_y_ = InputYFrom(inputs, scope); @@ -790,9 +790,9 @@ class FushionFcParam : public OpParam { #endif #ifdef FUSION_CONVADD_OP -class FushionConvAddParam : public OpParam { +class FusionConvAddParam : public OpParam { public: - FushionConvAddParam(const VariableNameMap &inputs, + FusionConvAddParam(const VariableNameMap &inputs, const VariableNameMap &outputs, const AttributeMap &attrs, const Scope &scope) { bias_ = InputYFrom(inputs, scope); @@ -835,16 +835,16 @@ class FushionConvAddParam : public OpParam { int groups; }; -Print &operator<<(Print &printer, const FushionConvAddParam &conv_param); +Print &operator<<(Print &printer, const FusionConvAddParam &conv_param); #endif #ifdef FUSION_CONVADD_RELU_OP -class FushionConvAddReluParam : public FushionConvAddParam { +class FusionConvAddReluParam : public FusionConvAddParam { public: - FushionConvAddReluParam(const VariableNameMap &inputs, + FusionConvAddReluParam(const VariableNameMap &inputs, const VariableNameMap &outputs, const AttributeMap &attrs, const Scope &scope) - : FushionConvAddParam(inputs, outputs, attrs, scope) {} + : FusionConvAddParam(inputs, outputs, attrs, scope) {} }; #endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c6b5fa94cd..9bfc55c93d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -88,7 +88,7 @@ else () target_link_libraries(test-relu-op paddle-mobile) # gen test - ADD_EXECUTABLE(test-fc-op operators/test_fushion_fc_op.cpp test_helper.h test_include.h) + ADD_EXECUTABLE(test-fc-op operators/test_fusion_fc_op.cpp test_helper.h test_include.h) target_link_libraries(test-fc-op paddle-mobile) # gen test log diff --git a/test/framework/test_optimize.cpp b/test/framework/test_optimize.cpp index 2cb920da61..32574764e1 100644 --- a/test/framework/test_optimize.cpp +++ b/test/framework/test_optimize.cpp @@ -23,7 +23,7 @@ int main() { auto program = loader.Load(g_mobilenet_ssd, true); paddle_mobile::framework::ProgramOptimize optimize; // program.originProgram->Description("origin"); - auto optimize_program = optimize.FushionOptimize(program.originProgram); + auto optimize_program = optimize.FusionOptimize(program.originProgram); if (optimize_program != nullptr) { // optimize_program->Description("optimize"); } else { diff --git a/test/operators/test_fushion_fc_op.cpp b/test/operators/test_fusion_fc_op.cpp similarity index 96% rename from test/operators/test_fushion_fc_op.cpp rename to test/operators/test_fusion_fc_op.cpp index 8dc1b02bec..a23bde45cb 100644 --- a/test/operators/test_fushion_fc_op.cpp +++ b/test/operators/test_fusion_fc_op.cpp @@ -49,8 +49,8 @@ class TestFcOp { DLOG << " Input Y is : " << op->Input("Y")[0]; DLOG << " Input Y is : " << op->Input("Z")[0]; DLOG << " Output Out is : " << op->Output("Out")[0]; - std::shared_ptr> testOp = - std::make_shared>( + std::shared_ptr> testOp = + std::make_shared>( op->Type(), op->GetInputs(), op->GetOutputs(), op->GetAttrMap(), program_.scope); ops_of_block_[*block_desc.get()].push_back(testOp); @@ -119,7 +119,7 @@ int main() { auto program = loader.Load(g_googlenet); paddle_mobile::framework::ProgramOptimize optimize; // program.originProgram->Description("origin"); - auto optimize_program = optimize.FushionOptimize(program.originProgram); + auto optimize_program = optimize.FusionOptimize(program.originProgram); program.optimizeProgram = optimize_program; -- GitLab