提交 65ec4f7c 编写于 作者: M Megvii Engine Team 提交者: Xu Xinran

fix(ci): fix test timeout

GitOrigin-RevId: 875fc613cfcdd64ee4da0727725d9226f1363faa
上级 ea6bfe6c
...@@ -168,12 +168,14 @@ std::vector<conv_bias::TestArg> get_nchw44_conv_bias_args( ...@@ -168,12 +168,14 @@ std::vector<conv_bias::TestArg> get_nchw44_conv_bias_args(
for (auto nlmode : nonlinemode) for (auto nlmode : nonlinemode)
for (size_t n : {1, 2}) for (size_t n : {1, 2})
for (size_t kernel : kernel_vec) for (size_t kernel : kernel_vec)
for (size_t oc : {4, 32}) for (size_t oc : {4, 12})
for (size_t ic : {1, 3, 4, 12, 32}) for (size_t ic : {1, 3, 4, 12})
for (size_t h : {3, 5, 12}) for (size_t h : {3, 5, 12})
for (size_t w : {7, 23}) { for (size_t w : {7, 16, 23}) {
for (size_t group = 1; for (size_t group = 1;
group <= std::min(oc, ic); ++group) { group <=
std::min(std::min(oc, ic), 4_z);
++group) {
pack(n, oc, ic, h, w, kernel, stride, pack(n, oc, ic, h, w, kernel, stride,
group, nlmode, bias); group, nlmode, bias);
} }
...@@ -350,16 +352,19 @@ TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_DIRECT_FP32_SMALL_GROUP) { ...@@ -350,16 +352,19 @@ TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_DIRECT_FP32_SMALL_GROUP) {
get_conv_bias_args({1, 2, 3, 4, 5, 6, 7}, 1, false, false, false), get_conv_bias_args({1, 2, 3, 4, 5, 6, 7}, 1, false, false, false),
handle(), "F32DIRECT_SMALL_GROUP"); handle(), "F32DIRECT_SMALL_GROUP");
} }
TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_DIRECT_FP32_NCHW44_S1_K7) { TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_DIRECT_FP32_NCHW44_S1_K7) {
check_conv_bias(get_nchw44_conv_bias_args({7}, 1, false, false, false, check_conv_bias(get_nchw44_conv_bias_args({7}, 1, false, true, true,
false, false, false), false, false, false),
handle(), "F32_CONV_NCHW44_DIRECT"); handle(), "F32_CONV_NCHW44_DIRECT");
} }
TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_DIRECT_FP32_NCHW44_S1_K2K3) { TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_DIRECT_FP32_NCHW44_S1_K2K3) {
check_conv_bias(get_nchw44_conv_bias_args({2, 3}, 1, false, false, false, check_conv_bias(get_nchw44_conv_bias_args({2, 3}, 1, false, false, false,
false, true, true), false, true, true),
handle(), "F32_CONV_NCHW44_DIRECT"); handle(), "F32_CONV_NCHW44_DIRECT");
} }
TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_DIRECT_FP32_NCHW44_S1_K5) { TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_DIRECT_FP32_NCHW44_S1_K5) {
check_conv_bias(get_nchw44_conv_bias_args({5}, 1, false, false, false, check_conv_bias(get_nchw44_conv_bias_args({5}, 1, false, false, false,
false, true, true), false, true, true),
...@@ -396,11 +401,13 @@ TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_NCHW_NCHW44_F32) { ...@@ -396,11 +401,13 @@ TEST_F(ARM_COMMON_MULTI_THREADS, CONVBIAS_NCHW_NCHW44_F32) {
false, true), false, true),
handle(), "F32_CONV_NCHW_NCHW44"); handle(), "F32_CONV_NCHW_NCHW44");
} }
TEST_F(ARM_COMMON_MULTI_THREADS, CONV_BIAS_CHANNEL_WISE_STRIDE1_FP32_NCHW44_1) { TEST_F(ARM_COMMON_MULTI_THREADS, CONV_BIAS_CHANNEL_WISE_STRIDE1_FP32_NCHW44_1) {
check_conv_bias( check_conv_bias(
get_nchw44_channel_wise_args({2, 3}, 1, false, false, false), get_nchw44_channel_wise_args({2, 3}, 1, false, false, false),
handle(), "F32_CHANNEL_WISE_NCHW44"); handle(), "F32_CHANNEL_WISE_NCHW44");
} }
TEST_F(ARM_COMMON_MULTI_THREADS, CONV_BIAS_CHANNEL_WISE_STRIDE1_FP32_NCHW44_2) { TEST_F(ARM_COMMON_MULTI_THREADS, CONV_BIAS_CHANNEL_WISE_STRIDE1_FP32_NCHW44_2) {
check_conv_bias(get_nchw44_channel_wise_args({5}, 1, false, false, false), check_conv_bias(get_nchw44_channel_wise_args({5}, 1, false, false, false),
handle(), "F32_CHANNEL_WISE_NCHW44"); handle(), "F32_CHANNEL_WISE_NCHW44");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册