From 7b0cfd82f6ff10f00adc0f1cfa109b2d1427159a Mon Sep 17 00:00:00 2001 From: liuruilong Date: Tue, 3 Jul 2018 17:09:33 +0800 Subject: [PATCH] format files --- src/framework/op_registry.h | 2 +- src/io/executor.cpp | 5 +- src/io/paddle_mobile.cpp | 2 +- src/io/paddle_mobile.h | 1 + src/ios_io/PaddleMobile.h | 6 +-- src/ios_io/PaddleMobile.mm | 6 +-- src/operators/fetch_op.cpp | 2 - src/operators/fetch_op.h | 1 - src/operators/fusion_conv_add.cpp | 3 +- src/operators/im2sequence_op.h | 1 - .../central-arm-func/batchnorm_arm_func.h | 50 +++++++++---------- src/operators/math/gemm.cpp | 13 +++-- src/operators/math/pool_2x2.cpp | 4 +- src/operators/math/pooling.cpp | 2 +- src/operators/transpose_op.h | 1 - test/common/test_openmp.cpp | 2 +- 16 files changed, 47 insertions(+), 54 deletions(-) diff --git a/src/framework/op_registry.h b/src/framework/op_registry.h index 8e22e74b4f..a76cc7e491 100644 --- a/src/framework/op_registry.h +++ b/src/framework/op_registry.h @@ -108,7 +108,7 @@ class OpRegistry { __op_registrar_##op_type##_##device_name(#op_type); \ int TouchOpRegistrar_##op_type##_##device_name() { \ __op_registrar_##op_type##_##device_name.Touch(); \ - printf(" registering !! \n"); \ + printf(" registering !! \n"); \ return 0; \ } diff --git a/src/io/executor.cpp b/src/io/executor.cpp index 1837273d6b..82c3eae5d9 100644 --- a/src/io/executor.cpp +++ b/src/io/executor.cpp @@ -355,8 +355,9 @@ std::shared_ptr Executor::Predict( const auto &pInfo = profile[i]; uint64_t timeCost = pInfo.runEnd - pInfo.runBegin; _tp[ops[i]->Type()] += timeCost; - // fprintf(pf, "%d\t%s\t%d\t%llu\t%llu\t%llu\n", i, ops[i]->Type().c_str(), - // pInfo.tid, pInfo.runBegin, pInfo.runEnd, timeCost); + // fprintf(pf, "%d\t%s\t%d\t%llu\t%llu\t%llu\n", i, + // ops[i]->Type().c_str(), + // pInfo.tid, pInfo.runBegin, pInfo.runEnd, timeCost); } // fclose(pf); diff --git a/src/io/paddle_mobile.cpp b/src/io/paddle_mobile.cpp index 850b60d5e1..3d5735f8da 100644 --- a/src/io/paddle_mobile.cpp +++ b/src/io/paddle_mobile.cpp @@ -75,7 +75,7 @@ void PaddleMobile::Clear() { } template -PaddleMobile::~PaddleMobile(){ +PaddleMobile::~PaddleMobile() { executor_ = nullptr; loader_ = nullptr; } diff --git a/src/io/paddle_mobile.h b/src/io/paddle_mobile.h index 82436a283d..3ce39e0ae1 100644 --- a/src/io/paddle_mobile.h +++ b/src/io/paddle_mobile.h @@ -61,6 +61,7 @@ class PaddleMobile { void Clear(); ~PaddleMobile(); + private: std::shared_ptr> loader_; std::shared_ptr> executor_; diff --git a/src/ios_io/PaddleMobile.h b/src/ios_io/PaddleMobile.h index 1e635dd0a8..863c0d0044 100644 --- a/src/ios_io/PaddleMobile.h +++ b/src/ios_io/PaddleMobile.h @@ -1,11 +1,11 @@ /* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved. - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/ios_io/PaddleMobile.mm b/src/ios_io/PaddleMobile.mm index b24edf592c..f5ec2afb2a 100644 --- a/src/ios_io/PaddleMobile.mm +++ b/src/ios_io/PaddleMobile.mm @@ -1,11 +1,11 @@ /* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved. - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/operators/fetch_op.cpp b/src/operators/fetch_op.cpp index dbcfaaa9ab..cdbe413c95 100644 --- a/src/operators/fetch_op.cpp +++ b/src/operators/fetch_op.cpp @@ -29,5 +29,3 @@ REGISTER_OPERATOR_MALI_GPU(fetch, ops::FetchOp); #endif #ifdef PADDLE_MOBILE_FPGA #endif - - diff --git a/src/operators/fetch_op.h b/src/operators/fetch_op.h index aa39e33419..5614fef8fe 100644 --- a/src/operators/fetch_op.h +++ b/src/operators/fetch_op.h @@ -44,7 +44,6 @@ class FetchOp : public framework::OperatorBase { FetchParam param_; }; - } // namespace operators } // namespace paddle_mobile diff --git a/src/operators/fusion_conv_add.cpp b/src/operators/fusion_conv_add.cpp index 1524791196..be70370f9d 100644 --- a/src/operators/fusion_conv_add.cpp +++ b/src/operators/fusion_conv_add.cpp @@ -48,8 +48,7 @@ void FusionConvAddOp::InferShape() const { #ifdef PADDLE_MOBILE_CPU #ifndef CONV_ADD_REGISTER -framework::FusionOpRegistrar convadd_registrar( - new FusionConvAddMatcher()); +framework::FusionOpRegistrar convadd_registrar(new FusionConvAddMatcher()); #define CONV_ADD_REGISTER #endif diff --git a/src/operators/im2sequence_op.h b/src/operators/im2sequence_op.h index 1eb180b54d..0695da9308 100644 --- a/src/operators/im2sequence_op.h +++ b/src/operators/im2sequence_op.h @@ -59,4 +59,3 @@ USE_OP_CPU(im2sequence); #endif #endif - diff --git a/src/operators/kernel/central-arm-func/batchnorm_arm_func.h b/src/operators/kernel/central-arm-func/batchnorm_arm_func.h index 276f6afe1b..2845e5f8b7 100644 --- a/src/operators/kernel/central-arm-func/batchnorm_arm_func.h +++ b/src/operators/kernel/central-arm-func/batchnorm_arm_func.h @@ -231,37 +231,35 @@ void BatchnormCompute(const BatchNormParam ¶m) { } #endif float *inv_std_ptr = new float[C]; - for (int i = 0; i < C; i++) { - inv_std_ptr[i] = - 1 / static_cast(pow((variance_ptr[i] + epsilon), 0.5)); - } - - Tensor new_scale; - auto new_scale_ptr = - new_scale.mutable_data(framework::make_ddim({C})); - Tensor new_bias; - auto new_bias_ptr = new_bias.mutable_data(framework::make_ddim({C})); + for (int i = 0; i < C; i++) { + inv_std_ptr[i] = + 1 / static_cast(pow((variance_ptr[i] + epsilon), 0.5)); + } - /// ((x - est_mean) * (inv_var) * scale + bias equal to - /// (x * inv_var * scale) + (bias - est_mean * inv_var * scale) - for (int i = 0; i < C; i++) { - new_scale_ptr[i] = inv_std_ptr[i] * scale_ptr[i]; - new_bias_ptr[i] = - bias_ptr[i] - mean_ptr[i] * inv_std_ptr[i] * scale_ptr[i]; - { - for (int n = 0; n < N; n++) { - for (int h = 0; h < H; h++) { - int tmp_index = n * stride0 + i * stride1 + h * stride2; - for (int w = 0; w < W; w++) { - int index = tmp_index + w; - out_ptr[index] = - input_x_ptr[index] * new_scale_ptr[i] + new_bias_ptr[i]; - } + Tensor new_scale; + auto new_scale_ptr = new_scale.mutable_data(framework::make_ddim({C})); + Tensor new_bias; + auto new_bias_ptr = new_bias.mutable_data(framework::make_ddim({C})); + + /// ((x - est_mean) * (inv_var) * scale + bias equal to + /// (x * inv_var * scale) + (bias - est_mean * inv_var * scale) + for (int i = 0; i < C; i++) { + new_scale_ptr[i] = inv_std_ptr[i] * scale_ptr[i]; + new_bias_ptr[i] = bias_ptr[i] - mean_ptr[i] * inv_std_ptr[i] * scale_ptr[i]; + { + for (int n = 0; n < N; n++) { + for (int h = 0; h < H; h++) { + int tmp_index = n * stride0 + i * stride1 + h * stride2; + for (int w = 0; w < W; w++) { + int index = tmp_index + w; + out_ptr[index] = + input_x_ptr[index] * new_scale_ptr[i] + new_bias_ptr[i]; } } } } - delete[] inv_std_ptr; + } + delete[] inv_std_ptr; } } // namespace operators diff --git a/src/operators/math/gemm.cpp b/src/operators/math/gemm.cpp index 0cc0598474..e9974df967 100644 --- a/src/operators/math/gemm.cpp +++ b/src/operators/math/gemm.cpp @@ -129,14 +129,13 @@ void PackMatrixB_(int k, int n, int n_tail, const float *B, int ldb, } #else for (i = 0; i < k; ++i) { - Bij = &B(i, j); - *buffer++ = *Bij; - *buffer++ = *(Bij + 1); - *buffer++ = *(Bij + 2); - *buffer++ = *(Bij + 3); - } + Bij = &B(i, j); + *buffer++ = *Bij; + *buffer++ = *(Bij + 1); + *buffer++ = *(Bij + 2); + *buffer++ = *(Bij + 3); + } #endif - } if (n_tail != 0) { for (i = 0; i < k; ++i) { diff --git a/src/operators/math/pool_2x2.cpp b/src/operators/math/pool_2x2.cpp index 1d5efdad0e..e0fd5da57c 100644 --- a/src/operators/math/pool_2x2.cpp +++ b/src/operators/math/pool_2x2.cpp @@ -102,7 +102,7 @@ void Pool2x2Avg(vector strides, vector paddings, const Tensor *input, #if __ARM_NEON #ifdef ARMV7 -const int batch_size = input->dims()[0]; + const int batch_size = input->dims()[0]; const int input_height = input->dims()[2]; @@ -173,7 +173,7 @@ const int batch_size = input->dims()[0]; } #else - //TODO(): to imp other asm +// TODO(): to imp other asm #endif diff --git a/src/operators/math/pooling.cpp b/src/operators/math/pooling.cpp index 4287408394..a8f6c77170 100644 --- a/src/operators/math/pooling.cpp +++ b/src/operators/math/pooling.cpp @@ -57,7 +57,7 @@ class PoolFunctor { T *output_data = output->mutable_data(); for (int i = 0; i < batch_size; i++) { - #pragma omp parallel for + // #pragma omp parallel for for (int c = 0; c < output_channels; ++c) { for (int ph = 0; ph < output_height; ++ph) { int hstart = ph * stride_height - padding_height; diff --git a/src/operators/transpose_op.h b/src/operators/transpose_op.h index 439ab2b6e1..25cf07c4c9 100644 --- a/src/operators/transpose_op.h +++ b/src/operators/transpose_op.h @@ -50,7 +50,6 @@ class TransposeOp : public framework::OperatorWithKernel< } // namespace operators } // namespace paddle_mobile - #ifdef PADDLE_MOBILE_CPU USE_OP_CPU(transpose); #endif diff --git a/test/common/test_openmp.cpp b/test/common/test_openmp.cpp index 790c434101..b9a112b5f0 100644 --- a/test/common/test_openmp.cpp +++ b/test/common/test_openmp.cpp @@ -17,7 +17,7 @@ limitations under the License. */ int main(void) { #ifdef PADDLE_MOBILE_USE_OPENMP - #pragma omp parallel num_threads(2) + // #pragma omp parallel num_threads(2) { // int thread_id = omp_get_thread_num(); // int nthreads = omp_get_num_threads(); -- GitLab