From 7bd15965e508d0eb37322f4ff3a9433bf312e4c6 Mon Sep 17 00:00:00 2001 From: eclipsess Date: Mon, 9 Jul 2018 17:04:24 +0800 Subject: [PATCH] little --- .../kernel/central-arm-func/conv_add_arm_func.h | 14 -------------- src/operators/math/depthwise_conv_3x3.cpp | 4 +--- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/operators/kernel/central-arm-func/conv_add_arm_func.h b/src/operators/kernel/central-arm-func/conv_add_arm_func.h index 41ea0d09e7..d364dfdd61 100644 --- a/src/operators/kernel/central-arm-func/conv_add_arm_func.h +++ b/src/operators/kernel/central-arm-func/conv_add_arm_func.h @@ -125,24 +125,10 @@ void ConvAddCompute(const FusionConvAddParam ¶m) { param.Input()->dims()[1] == param.Output()->dims()[1] && param.Filter()->dims()[2] == param.Filter()->dims()[3] && param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2) { - // Tensor in,out,filter; - // auto inptr = in.mutable_data({1,2,10,10}); - // auto filterptr = filter.mutable_data({2,1,3,3}); - // auto outputptr= out.mutable_data({1,2,5,5}); - // for(int i = 0; i < in.numel(); ++i) - // { - // inptr[i] = i; - // } - // for (int i = 0; i < filter.numel(); ++i) - // { - // filterptr[i] = i; - // } // math::DepthwiseConv3x3(param.Input(), param.Strides(), // param.Paddings(), // param.Filter(), param.Bias(), param.Output(), // false); - // math::DepthwiseConv3x3(&in, param.Strides(), param.Paddings(), - // &filter, param.Bias(), &out, false); math::DepthwiseConv3x3s2p1v2(param.Input(), param.Filter(), param.Output(), *param.Bias(), true); diff --git a/src/operators/math/depthwise_conv_3x3.cpp b/src/operators/math/depthwise_conv_3x3.cpp index 33ad76b96a..c8e332c7dd 100644 --- a/src/operators/math/depthwise_conv_3x3.cpp +++ b/src/operators/math/depthwise_conv_3x3.cpp @@ -14,7 +14,6 @@ limitations under the License. */ #include "operators/math/depthwise_conv_3x3.h" #include #include -#define UNLIKELY(condition) __builtin_expect(static_cast(condition), 0) namespace paddle_mobile { namespace operators { @@ -1241,8 +1240,7 @@ void DepthwiseConvAddBNRelu3x3s2p1v2(const Tensor *input, const Tensor *filter, const int w_times = (out_w - 2) / 3; - float32x4x2_t input_buff_mid{}, input_buff_bottom[w_times + 1], - input_buff_top[w_times + 1]; + float32x4x2_t input_buff_mid{}, input_buff_bottom[w_times + 1]; float32x4_t elewise_res0, elewise_res1, elewise_res2, res3; int out2in_mid; float32x4_t zero = vdupq_n_f32(0.0); -- GitLab