提交 0f6b88d2 编写于 作者: C chenjiaoAngel

fiix format. test=develop

上级 45f8b54a
...@@ -35,6 +35,7 @@ void conv_depthwise_5x5s1_bias(float* dout, ...@@ -35,6 +35,7 @@ void conv_depthwise_5x5s1_bias(float* dout,
int pad_left, int pad_left,
int pad_right, int pad_right,
ARMContext* ctx); ARMContext* ctx);
void conv_depthwise_5x5s1_bias_relu(float* dout, void conv_depthwise_5x5s1_bias_relu(float* dout,
const float* din, const float* din,
const float* weights, const float* weights,
...@@ -51,6 +52,7 @@ void conv_depthwise_5x5s1_bias_relu(float* dout, ...@@ -51,6 +52,7 @@ void conv_depthwise_5x5s1_bias_relu(float* dout,
int pad_left, int pad_left,
int pad_right, int pad_right,
ARMContext* ctx); ARMContext* ctx);
void conv_depthwise_5x5s1_bias_relu6(float* dout, void conv_depthwise_5x5s1_bias_relu6(float* dout,
const float* din, const float* din,
const float* weights, const float* weights,
...@@ -68,6 +70,7 @@ void conv_depthwise_5x5s1_bias_relu6(float* dout, ...@@ -68,6 +70,7 @@ void conv_depthwise_5x5s1_bias_relu6(float* dout,
int pad_left, int pad_left,
int pad_right, int pad_right,
ARMContext* ctx); ARMContext* ctx);
void conv_depthwise_5x5s1_bias_leakyRelu(float* dout, void conv_depthwise_5x5s1_bias_leakyRelu(float* dout,
const float* din, const float* din,
const float* weights, const float* weights,
...@@ -85,6 +88,7 @@ void conv_depthwise_5x5s1_bias_leakyRelu(float* dout, ...@@ -85,6 +88,7 @@ void conv_depthwise_5x5s1_bias_leakyRelu(float* dout,
int pad_left, int pad_left,
int pad_right, int pad_right,
ARMContext* ctx); ARMContext* ctx);
void conv_depthwise_5x5s1_fp32(float* dout, void conv_depthwise_5x5s1_fp32(float* dout,
const float* din, const float* din,
const float* weights, const float* weights,
...@@ -190,6 +194,7 @@ void conv_depthwise_5x5s1_fp32(float* dout, ...@@ -190,6 +194,7 @@ void conv_depthwise_5x5s1_fp32(float* dout,
ctx); ctx);
} }
} }
// clang-format off // clang-format off
#ifdef __aarch64__ #ifdef __aarch64__
#define COMPUTE_ONE_LINE_S1_PRE \ #define COMPUTE_ONE_LINE_S1_PRE \
......
...@@ -57,7 +57,6 @@ void DepthwiseConv<PRECISION(kFloat), PRECISION(kFloat)>::PrepareForRun() { ...@@ -57,7 +57,6 @@ void DepthwiseConv<PRECISION(kFloat), PRECISION(kFloat)>::PrepareForRun() {
kernel_func_name_ = "conv_depthwise_3x3_fp32"; kernel_func_name_ = "conv_depthwise_3x3_fp32";
#endif #endif
} else if (kw == 5) { } else if (kw == 5) {
// VLOG(5) << "invoke 5x5 dw conv fp32";
bool pads_five = (paddings[0] < 5) || (paddings[2] < 5); bool pads_five = (paddings[0] < 5) || (paddings[2] < 5);
auto strides = param.strides; auto strides = param.strides;
if (ch_four && pads_five && win >= kw && hin >= kw && if (ch_four && pads_five && win >= kw && hin >= kw &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册