diff options
Diffstat (limited to 'src/backends/tosaCommon/test/OneToOneMappingTests.cpp')
| -rw-r--r-- | src/backends/tosaCommon/test/OneToOneMappingTests.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/backends/tosaCommon/test/OneToOneMappingTests.cpp b/src/backends/tosaCommon/test/OneToOneMappingTests.cpp index 2b0c1e55c7..e74c638ee9 100644 --- a/src/backends/tosaCommon/test/OneToOneMappingTests.cpp +++ b/src/backends/tosaCommon/test/OneToOneMappingTests.cpp @@ -177,10 +177,10 @@ TEST_CASE("GetTosaMappingFromLayer_Conv2dLayer") basicBlock, inputShape, outputShape, Op_CONV2D, Attribute_ConvAttribute, descriptor, LayerType::Convolution2d); } -TEST_CASE("GetTosaMapping_MaxPool2DLayer") +TEST_CASE("GetTosaMapping_AvgPool2DLayer") { Pooling2dDescriptor descriptor; - descriptor.m_PoolType = PoolingAlgorithm::Max; + descriptor.m_PoolType = PoolingAlgorithm::Average; descriptor.m_PoolWidth = descriptor.m_PoolHeight = 2; descriptor.m_StrideX = descriptor.m_StrideY = 2; descriptor.m_PadLeft = 1; @@ -196,12 +196,17 @@ TEST_CASE("GetTosaMapping_MaxPool2DLayer") std::vector<std::vector<int32_t>> outputShape = {{ 1, 1, 3, 3 }}; TosaSerializationBasicBlock* basicBlock = - GetTosaMapping(nullptr, LayerType::Pooling2d, {&inputTensorInfo}, {&outputTensorInfo}, descriptor); - AssertTosaOneToOneMappingBasicBlock( - basicBlock, inputShape, outputShape, Op_MAX_POOL2D, Attribute_PoolAttribute, descriptor, LayerType::Pooling2d); + GetTosaMapping(nullptr, LayerType::Pooling2d, {&inputTensorInfo}, {&outputTensorInfo}, descriptor); + AssertTosaOneToOneMappingBasicBlock(basicBlock, + inputShape, + outputShape, + Op_AVG_POOL2D, + Attribute_PoolAttribute, + descriptor, + LayerType::Pooling2d); } -TEST_CASE("GetTosaMappingFromLayer_MaxPool2DLayer") +TEST_CASE("GetTosaMappingFromLayer_AvgPool2DLayer") { IRuntime::CreationOptions options; IRuntimePtr runtime(IRuntime::Create(options)); @@ -210,7 +215,7 @@ TEST_CASE("GetTosaMappingFromLayer_MaxPool2DLayer") INetworkPtr net(INetwork::Create()); Pooling2dDescriptor descriptor; - descriptor.m_PoolType = PoolingAlgorithm::Max; + descriptor.m_PoolType = PoolingAlgorithm::Average; descriptor.m_PoolWidth = descriptor.m_PoolHeight = 2; descriptor.m_StrideX = descriptor.m_StrideY = 2; descriptor.m_PadLeft = 1; @@ -219,11 +224,11 @@ TEST_CASE("GetTosaMappingFromLayer_MaxPool2DLayer") descriptor.m_PadBottom = 1; descriptor.m_PaddingMethod = PaddingMethod::Exclude; - IConnectableLayer* input = net->AddInputLayer(0, "input0"); - IConnectableLayer* pool = net->AddPooling2dLayer(descriptor, "pool"); - IConnectableLayer* output = net->AddOutputLayer(0, "output"); + IConnectableLayer* input0 = net->AddInputLayer(0, "input0"); + IConnectableLayer* pool = net->AddPooling2dLayer(descriptor, "pool"); + IConnectableLayer* output = net->AddOutputLayer(0, "output"); - input->GetOutputSlot(0).Connect(pool->GetInputSlot(0)); + input0->GetOutputSlot(0).Connect(pool->GetInputSlot(0)); pool->GetOutputSlot(0).Connect(output->GetInputSlot(0)); TensorInfo inputTensorInfo({ 1, 1, 4, 4 }, DataType::Float32); @@ -232,19 +237,24 @@ TEST_CASE("GetTosaMappingFromLayer_MaxPool2DLayer") std::vector<std::vector<int32_t>> inputShape = {{ 1, 1, 4, 4 }}; std::vector<std::vector<int32_t>> outputShape = {{ 1, 1, 3, 3 }}; - input->GetOutputSlot(0).SetTensorInfo(inputTensorInfo); + input0->GetOutputSlot(0).SetTensorInfo(inputTensorInfo); pool->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); TosaSerializationBasicBlock* basicBlock = - GetTosaMappingFromLayer(PolymorphicDowncast<Layer*>(pool)); - AssertTosaOneToOneMappingBasicBlock( - basicBlock, inputShape, outputShape, Op_MAX_POOL2D, Attribute_PoolAttribute, descriptor, LayerType::Pooling2d); + GetTosaMappingFromLayer(PolymorphicDowncast<Layer*>(pool)); + AssertTosaOneToOneMappingBasicBlock(basicBlock, + inputShape, + outputShape, + Op_AVG_POOL2D, + Attribute_PoolAttribute, + descriptor, + LayerType::Pooling2d); } -TEST_CASE("GetTosaMapping_AvgPool2DLayer") +TEST_CASE("GetTosaMapping_MaxPool2DLayer") { Pooling2dDescriptor descriptor; - descriptor.m_PoolType = PoolingAlgorithm::Average; + descriptor.m_PoolType = PoolingAlgorithm::Max; descriptor.m_PoolWidth = descriptor.m_PoolHeight = 2; descriptor.m_StrideX = descriptor.m_StrideY = 2; descriptor.m_PadLeft = 1; @@ -261,16 +271,11 @@ TEST_CASE("GetTosaMapping_AvgPool2DLayer") TosaSerializationBasicBlock* basicBlock = GetTosaMapping(nullptr, LayerType::Pooling2d, {&inputTensorInfo}, {&outputTensorInfo}, descriptor); - AssertTosaOneToOneMappingBasicBlock(basicBlock, - inputShape, - outputShape, - Op_AVG_POOL2D, - Attribute_PoolAttribute, - descriptor, - LayerType::Pooling2d); + AssertTosaOneToOneMappingBasicBlock( + basicBlock, inputShape, outputShape, Op_MAX_POOL2D, Attribute_PoolAttribute, descriptor, LayerType::Pooling2d); } -TEST_CASE("GetTosaMappingFromLayer_AvgPool2DLayer") +TEST_CASE("GetTosaMappingFromLayer_MaxPool2DLayer") { IRuntime::CreationOptions options; IRuntimePtr runtime(IRuntime::Create(options)); @@ -279,7 +284,7 @@ TEST_CASE("GetTosaMappingFromLayer_AvgPool2DLayer") INetworkPtr net(INetwork::Create()); Pooling2dDescriptor descriptor; - descriptor.m_PoolType = PoolingAlgorithm::Average; + descriptor.m_PoolType = PoolingAlgorithm::Max; descriptor.m_PoolWidth = descriptor.m_PoolHeight = 2; descriptor.m_StrideX = descriptor.m_StrideY = 2; descriptor.m_PadLeft = 1; @@ -288,11 +293,11 @@ TEST_CASE("GetTosaMappingFromLayer_AvgPool2DLayer") descriptor.m_PadBottom = 1; descriptor.m_PaddingMethod = PaddingMethod::Exclude; - IConnectableLayer* input0 = net->AddInputLayer(0, "input0"); - IConnectableLayer* pool = net->AddPooling2dLayer(descriptor, "pool"); - IConnectableLayer* output = net->AddOutputLayer(0, "output"); + IConnectableLayer* input = net->AddInputLayer(0, "input0"); + IConnectableLayer* pool = net->AddPooling2dLayer(descriptor, "pool"); + IConnectableLayer* output = net->AddOutputLayer(0, "output"); - input0->GetOutputSlot(0).Connect(pool->GetInputSlot(0)); + input->GetOutputSlot(0).Connect(pool->GetInputSlot(0)); pool->GetOutputSlot(0).Connect(output->GetInputSlot(0)); TensorInfo inputTensorInfo({ 1, 1, 4, 4 }, DataType::Float32); @@ -301,18 +306,13 @@ TEST_CASE("GetTosaMappingFromLayer_AvgPool2DLayer") std::vector<std::vector<int32_t>> inputShape = {{ 1, 1, 4, 4 }}; std::vector<std::vector<int32_t>> outputShape = {{ 1, 1, 3, 3 }}; - input0->GetOutputSlot(0).SetTensorInfo(inputTensorInfo); + input->GetOutputSlot(0).SetTensorInfo(inputTensorInfo); pool->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); TosaSerializationBasicBlock* basicBlock = GetTosaMappingFromLayer(PolymorphicDowncast<Layer*>(pool)); - AssertTosaOneToOneMappingBasicBlock(basicBlock, - inputShape, - outputShape, - Op_AVG_POOL2D, - Attribute_PoolAttribute, - descriptor, - LayerType::Pooling2d); + AssertTosaOneToOneMappingBasicBlock( + basicBlock, inputShape, outputShape, Op_MAX_POOL2D, Attribute_PoolAttribute, descriptor, LayerType::Pooling2d); } TEST_CASE("GetTosaMapping_ReshapeLayer") |