colin
/
TIM-VX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixup for unit test case naming 

Signed-off-by: Kainan Cha <kainan.zha@verisilicon.com>
This commit is contained in:
Kainan Cha 2021-06-09 10:51:26 +08:00
parent 7fcd9a3327
commit a7d962ac5c
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tim/vx/ops/deconv2d_test.cc
View File

@ -17,7 +17,7 @@ size_t element_count(const tim::vx::ShapeType& shape) {
} // namespace } // namespace
TEST(deconv2d, shape_3_3_2_1_float_depthwise) { TEST(DeConv2d, shape_3_3_2_1_float_depthwise) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -55,7 +55,7 @@ TEST(deconv2d, shape_3_3_2_1_float_depthwise) {
EXPECT_TRUE(input_tensor->CopyDataToTensor(input_data.data(), input_data.size()*4)); EXPECT_TRUE(input_tensor->CopyDataToTensor(input_data.data(), input_data.size()*4));
EXPECT_TRUE(kernel_tensor->CopyDataToTensor(kernel_data.data(), kernel_data.size()*4)); EXPECT_TRUE(kernel_tensor->CopyDataToTensor(kernel_data.data(), kernel_data.size()*4));
auto add = graph->CreateOperation<tim::vx::ops::DeConv2d>( auto op = graph->CreateOperation<tim::vx::ops::DeConv2d>(
2, 2,
tim::vx::PadType::SAME, tim::vx::PadType::SAME,
std::array<uint32_t, 2>({3, 3}), /*ksize*/ std::array<uint32_t, 2>({3, 3}), /*ksize*/
@ -63,7 +63,7 @@ TEST(deconv2d, shape_3_3_2_1_float_depthwise) {
std::array<uint32_t, 2>({1, 1}), /*dilation*/ std::array<uint32_t, 2>({1, 1}), /*dilation*/
std::array<uint32_t, 4>({0, 0, 0, 0}), /*pad*/ std::array<uint32_t, 4>({0, 0, 0, 0}), /*pad*/
2/*group*/); 2/*group*/);
(*add).BindInputs({input_tensor, kernel_tensor}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor, kernel_tensor}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());
@ -85,7 +85,7 @@ TEST(deconv2d, shape_3_3_2_1_float_depthwise) {
EXPECT_EQ(golden, output_data) << "Result mismatch"; EXPECT_EQ(golden, output_data) << "Result mismatch";
} }
TEST(deconv2d, shape_3_3_1_1_float) { TEST(DeConv2d, shape_3_3_1_1_float) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -114,7 +114,7 @@ TEST(deconv2d, shape_3_3_1_1_float) {
EXPECT_TRUE(input_tensor->CopyDataToTensor(input_data.data(), input_data.size()*4)); EXPECT_TRUE(input_tensor->CopyDataToTensor(input_data.data(), input_data.size()*4));
EXPECT_TRUE(kernel_tensor->CopyDataToTensor(kernel_data.data(), kernel_data.size()*4)); EXPECT_TRUE(kernel_tensor->CopyDataToTensor(kernel_data.data(), kernel_data.size()*4));
auto add = graph->CreateOperation<tim::vx::ops::DeConv2d>( auto op = graph->CreateOperation<tim::vx::ops::DeConv2d>(
1, 1,
tim::vx::PadType::SAME, tim::vx::PadType::SAME,
std::array<uint32_t, 2>({3, 3}), /*ksize*/ std::array<uint32_t, 2>({3, 3}), /*ksize*/
@ -122,7 +122,7 @@ TEST(deconv2d, shape_3_3_1_1_float) {
std::array<uint32_t, 2>({1, 1}), /*dilation*/ std::array<uint32_t, 2>({1, 1}), /*dilation*/
std::array<uint32_t, 4>({0, 0, 0, 0}), /*pad*/ std::array<uint32_t, 4>({0, 0, 0, 0}), /*pad*/
1/*group*/); 1/*group*/);
(*add).BindInputs({input_tensor, kernel_tensor}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor, kernel_tensor}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());
@ -135,4 +135,4 @@ TEST(deconv2d, shape_3_3_1_1_float) {
}; };
EXPECT_EQ(golden, output_data) << "Result mismatch"; EXPECT_EQ(golden, output_data) << "Result mismatch";
} }

4
src/tim/vx/ops/instancenormalization_test.cc
View File

@ -40,7 +40,7 @@ template<typename T>
} }
} }
TEST(instance_norm, shape_3_6_1_float) { TEST(InstanceNorm, shape_3_6_1_float) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -97,7 +97,7 @@ TEST(instance_norm, shape_3_6_1_float) {
EXPECT_TRUE(ArraysMatch(golden, output, 1e-5f)); EXPECT_TRUE(ArraysMatch(golden, output, 1e-5f));
} }
TEST(instance_norm, shape_3_3_6_1_float) { TEST(InstanceNorm, shape_3_3_6_1_float) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();

36
src/tim/vx/ops/relational_operations_test.cc
View File

@ -27,7 +27,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
TEST(OP, equal_shape_1_uint8) { TEST(Equal, shape_1_uint8) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -50,8 +50,8 @@ TEST(OP, equal_shape_1_uint8) {
EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size())); EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()));
EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size())); EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()));
auto add = graph->CreateOperation<tim::vx::ops::Equal>(); auto op = graph->CreateOperation<tim::vx::ops::Equal>();
(*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());
@ -63,7 +63,7 @@ TEST(OP, equal_shape_1_uint8) {
EXPECT_EQ(golden, output); EXPECT_EQ(golden, output);
} }
TEST(OP, notequal_shape_5_fp32) { TEST(NotEqual, shape_5_fp32) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -85,8 +85,8 @@ TEST(OP, notequal_shape_5_fp32) {
EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4)); EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4)); EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
auto add = graph->CreateOperation<tim::vx::ops::NotEqual>(); auto op = graph->CreateOperation<tim::vx::ops::NotEqual>();
(*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());
@ -98,7 +98,7 @@ TEST(OP, notequal_shape_5_fp32) {
EXPECT_EQ(golden, output); EXPECT_EQ(golden, output);
} }
TEST(OP, less_shape_5_1_fp32) { TEST(Less, shape_5_1_fp32) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -120,8 +120,8 @@ TEST(OP, less_shape_5_1_fp32) {
EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4)); EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4)); EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
auto add = graph->CreateOperation<tim::vx::ops::Less>(); auto op = graph->CreateOperation<tim::vx::ops::Less>();
(*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());
@ -133,7 +133,7 @@ TEST(OP, less_shape_5_1_fp32) {
EXPECT_EQ(golden, output); EXPECT_EQ(golden, output);
} }
TEST(OP, greaterorequal_shape_5_2_1_fp32) { TEST(GreaterOrEqual, shape_5_2_1_fp32) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -159,8 +159,8 @@ TEST(OP, greaterorequal_shape_5_2_1_fp32) {
EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4)); EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4)); EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
auto add = graph->CreateOperation<tim::vx::ops::GreaterOrEqual>(); auto op = graph->CreateOperation<tim::vx::ops::GreaterOrEqual>();
(*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());
@ -172,7 +172,7 @@ TEST(OP, greaterorequal_shape_5_2_1_fp32) {
EXPECT_EQ(golden, output); EXPECT_EQ(golden, output);
} }
TEST(OP, greater_shape_5_2_1_1_fp32) { TEST(Greater, shape_5_2_1_1_fp32) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -198,8 +198,8 @@ TEST(OP, greater_shape_5_2_1_1_fp32) {
EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4)); EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4)); EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
auto add = graph->CreateOperation<tim::vx::ops::Greater>(); auto op = graph->CreateOperation<tim::vx::ops::Greater>();
(*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());
@ -211,7 +211,7 @@ TEST(OP, greater_shape_5_2_1_1_fp32) {
EXPECT_EQ(golden, output); EXPECT_EQ(golden, output);
} }
TEST(OP, lessorequal_shape_1_5_2_1_1_fp32) { TEST(LessOrEqual, shape_1_5_2_1_1_fp32) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -237,8 +237,8 @@ TEST(OP, lessorequal_shape_1_5_2_1_1_fp32) {
EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4)); EXPECT_TRUE(input_tensor1->CopyDataToTensor(in_data1.data(), in_data1.size()*4));
EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4)); EXPECT_TRUE(input_tensor2->CopyDataToTensor(in_data2.data(), in_data2.size()*4));
auto add = graph->CreateOperation<tim::vx::ops::LessOrEqual>(); auto op = graph->CreateOperation<tim::vx::ops::LessOrEqual>();
(*add).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor1, input_tensor2}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());

12
src/tim/vx/ops/reorg_test.cc
View File

@ -29,7 +29,7 @@
// FIXME (KC) : There seems to be a limitation that Channel needs to be >= 4, // FIXME (KC) : There seems to be a limitation that Channel needs to be >= 4,
// also stride other than 2 is not tested // also stride other than 2 is not tested
TEST(OP, reorg_shape_4_4_4_1_u8) { TEST(Reorg, shape_4_4_4_1_u8) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -59,8 +59,8 @@ TEST(OP, reorg_shape_4_4_4_1_u8) {
EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size())); EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size()));
auto add = graph->CreateOperation<tim::vx::ops::Reorg>(2); auto op = graph->CreateOperation<tim::vx::ops::Reorg>(2);
(*add).BindInputs({input_tensor}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());
@ -69,7 +69,7 @@ TEST(OP, reorg_shape_4_4_4_1_u8) {
EXPECT_EQ(golden, output); EXPECT_EQ(golden, output);
} }
TEST(OP, reorg_shape_4_4_4_1_fp32) { TEST(Reorg, shape_4_4_4_1_fp32) {
auto ctx = tim::vx::Context::Create(); auto ctx = tim::vx::Context::Create();
auto graph = ctx->CreateGraph(); auto graph = ctx->CreateGraph();
@ -98,8 +98,8 @@ TEST(OP, reorg_shape_4_4_4_1_fp32) {
EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size()*4)); EXPECT_TRUE(input_tensor->CopyDataToTensor(in_data.data(), in_data.size()*4));
auto add = graph->CreateOperation<tim::vx::ops::Reorg>(2); auto op = graph->CreateOperation<tim::vx::ops::Reorg>(2);
(*add).BindInputs({input_tensor}).BindOutputs({output_tensor}); (*op).BindInputs({input_tensor}).BindOutputs({output_tensor});
EXPECT_TRUE(graph->Compile()); EXPECT_TRUE(graph->Compile());
EXPECT_TRUE(graph->Run()); EXPECT_TRUE(graph->Run());