提交 7bd15965 编写于 作者: E eclipsess

little

上级 7dca8ab1
......@@ -125,24 +125,10 @@ void ConvAddCompute(const FusionConvAddParam &param) {
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<float>({1,2,10,10});
// auto filterptr = filter.mutable_data<float>({2,1,3,3});
// auto outputptr= out.mutable_data<float>({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);
......
......@@ -14,7 +14,6 @@ limitations under the License. */
#include "operators/math/depthwise_conv_3x3.h"
#include <arm_neon.h>
#include <vector>
#define UNLIKELY(condition) __builtin_expect(static_cast<bool>(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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册