From 73b97af2e697be66d55b836f1964173251334e2a Mon Sep 17 00:00:00 2001 From: HappyAngel Date: Fri, 5 Jun 2020 19:10:41 +0800 Subject: [PATCH] fix conflict test=develop --- lite/tests/math/conv_int8_compute_test.cc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lite/tests/math/conv_int8_compute_test.cc b/lite/tests/math/conv_int8_compute_test.cc index 059241a1f8..8dac81fe9f 100644 --- a/lite/tests/math/conv_int8_compute_test.cc +++ b/lite/tests/math/conv_int8_compute_test.cc @@ -56,11 +56,7 @@ DEFINE_int32(dila_w, 1, "dilation width"); DEFINE_bool(flag_act, true, "do act"); DEFINE_bool(flag_bias, true, "with bias"); DEFINE_double(clipped_coef, 1.0, "clipped relu coef"); -<<<<<<< HEAD -DEFINE_double(leakey_relu_alpha, 8.88, "leakey relu alpha"); -======= DEFINE_double(leakey_relu_alpha, 2.22, "leakey relu alpha"); ->>>>>>> 1c415218f9e7ce243837d855ba8d9929f3b8457d typedef paddle::lite::DDim DDim; typedef paddle::lite::Tensor Tensor; @@ -495,11 +491,7 @@ TEST(TestConv3x3DWInt8, test_conv3x3_depthwise) { for (auto& stride : {1, 2}) { for (auto& pad : {0, 1}) { for (auto& flag_bias : {false, true}) { -<<<<<<< HEAD - for (auto& flag_act : {0, 1}) { -======= for (auto& flag_act : {0, 1, 2, 4}) { ->>>>>>> 1c415218f9e7ce243837d855ba8d9929f3b8457d for (auto& c : {1, 3, 5, 8, 16, 32}) { std::vector dims; DDim weights_dim({c, 1, 3, 3}); -- GitLab