提交 5a3f7e4e 编写于 作者: C chenjiaoAngel

delete warning and extra info, test=develop

上级 619ceed1
...@@ -142,7 +142,7 @@ static bool conv_trans_weights_numc(const dtype* din, ...@@ -142,7 +142,7 @@ static bool conv_trans_weights_numc(const dtype* din,
template <typename Dtype> template <typename Dtype>
void transpose(const Dtype* din, Dtype* dout, int m, int n) { void transpose(const Dtype* din, Dtype* dout, int m, int n) {
// nxm == mxn // nxm == mxn
// 4x4 分块处理 // 4x4
int cnt_n = n >> 2; int cnt_n = n >> 2;
int remain_n = n & 3; int remain_n = n & 3;
int cnt_m = m >> 2; int cnt_m = m >> 2;
......
...@@ -2044,7 +2044,7 @@ void pooling3x3s1p0_avg(const float* din, ...@@ -2044,7 +2044,7 @@ void pooling3x3s1p0_avg(const float* din,
} else { } else {
if (pad_bottom > 1) { if (pad_bottom > 1) {
coef_h = 1.f / 3; coef_h = 1.f / 3;
} else if (pad_bottom = 1) { } else if (pad_bottom == 1) {
coef_h = 0.5f; coef_h = 0.5f;
} else { } else {
coef_h = 1.f; coef_h = 1.f;
......
...@@ -46,14 +46,6 @@ void seq_pool_sum<float>(const float* din, ...@@ -46,14 +46,6 @@ void seq_pool_sum<float>(const float* din,
memcpy(dout_ptr, din_ptr, width * sizeof(float)); memcpy(dout_ptr, din_ptr, width * sizeof(float));
din_ptr += width; din_ptr += width;
height = height - 1; height = height - 1;
#if 0
for (int h = 0; h < height; h++) {
for (int w = 0; w < width; ++w) {
dout_ptr[w] += din_ptr[w];
}
din_ptr += width;
}
#else
int cnt_w = width >> 2; int cnt_w = width >> 2;
int remain_w = width & 3; int remain_w = width & 3;
int cnt_h = height >> 2; int cnt_h = height >> 2;
...@@ -109,7 +101,6 @@ void seq_pool_sum<float>(const float* din, ...@@ -109,7 +101,6 @@ void seq_pool_sum<float>(const float* din,
} }
dout_ptr++; dout_ptr++;
} }
#endif
} }
} }
} }
...@@ -203,14 +194,6 @@ void seq_pool_max<float>(const float* din, ...@@ -203,14 +194,6 @@ void seq_pool_max<float>(const float* din,
memcpy(dout_ptr, din_ptr, width * sizeof(float)); memcpy(dout_ptr, din_ptr, width * sizeof(float));
din_ptr += width; din_ptr += width;
height = height - 1; height = height - 1;
#if 0
for (int h = 0; h < rheight; h++) {
for (int w = 0; w < width; w++) {
dout_ptr[w] = std::max(dout_ptr[w], din_ptr[w]);
}
din_ptr += width;
}
#else
int cnt_w = width >> 2; int cnt_w = width >> 2;
int remain_w = width & 3; int remain_w = width & 3;
int cnt_h = height >> 2; int cnt_h = height >> 2;
...@@ -267,7 +250,6 @@ void seq_pool_max<float>(const float* din, ...@@ -267,7 +250,6 @@ void seq_pool_max<float>(const float* din,
} }
dout_ptr++; dout_ptr++;
} }
#endif
} }
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册