diff options
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp')
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp | 241 |
1 files changed, 130 insertions, 111 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp index 586b831e45..3cfd614336 100644 --- a/src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp @@ -23,23 +23,25 @@ namespace armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory, - armnn::ReverseV2Descriptor descriptor, const std::vector<T>& input, + const std::vector<int>& axis, const std::vector<T>& outputExpected, const armnn::TensorInfo& inputInfo, + const armnn::TensorInfo& axisInfo, const armnn::TensorInfo& outputInfo) { LayerTestResult<T, NumDims> result(outputInfo); std::vector<T> outputActual(outputInfo.GetNumElements()); std::unique_ptr<armnn::ITensorHandle> inputHandle = tensorHandleFactory.CreateTensorHandle(inputInfo); + std::unique_ptr<armnn::ITensorHandle> axisHandle = tensorHandleFactory.CreateTensorHandle(axisInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = tensorHandleFactory.CreateTensorHandle(outputInfo); armnn::ReverseV2QueueDescriptor queueDescriptor; - queueDescriptor.m_Parameters = std::move(descriptor); armnn::WorkloadInfo workloadInfo; AddInputToWorkload(queueDescriptor, workloadInfo, inputInfo, inputHandle.get()); + AddInputToWorkload(queueDescriptor, workloadInfo, axisInfo, axisHandle.get()); AddOutputToWorkload(queueDescriptor, workloadInfo, outputInfo, outputHandle.get()); // Don't execute if ReverseV2 is not supported, as an exception will be raised. @@ -47,9 +49,9 @@ namespace std::string reasonIfUnsupported; armnn::LayerSupportHandle handle = armnn::GetILayerSupportByBackendId(backend); result.m_Supported = handle.IsReverseV2Supported(inputInfo, - outputInfo, - queueDescriptor.m_Parameters, - reasonIfUnsupported); + axisInfo, + outputInfo, + reasonIfUnsupported); if (!result.m_Supported) { return result; @@ -58,9 +60,11 @@ namespace auto workload = workloadFactory.CreateWorkload(armnn::LayerType::ReverseV2, queueDescriptor, workloadInfo); inputHandle->Allocate(); + axisHandle->Allocate(); outputHandle->Allocate(); CopyDataToITensorHandle(inputHandle.get(), input.data()); + CopyDataToITensorHandle(axisHandle.get(), axis.data()); workload->PostAllocationConfigure(); ExecuteWorkload(*workload, memoryManager); @@ -80,13 +84,13 @@ LayerTestResult<T, 2> ReverseV2SimpleTestEmptyAxis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is the same as input - auto descriptor = armnn::ReverseV2Descriptor(); + // Simple test with no axes set so output is the same as input float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2,2}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2,2}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -94,6 +98,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTestEmptyAxis( 3, 4 }, qScale, qOffset); + std::vector<int> axis = armnnUtils::QuantizedVector<int>({}, qScale, qOffset); + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 1, 2, 3, 4 @@ -102,10 +108,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTestEmptyAxis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -115,26 +122,27 @@ LayerTestResult<T, 2> ReverseV2SimpleTestEmptyTensor( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. Empty tensor set so output is the same as input - auto descriptor = armnn::ReverseV2Descriptor(); + // Simple test with empty input tensor float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({0}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({0}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({0}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({}, qScale, qOffset); - + std::vector<int> axis = armnnUtils::QuantizedVector<int>({}, qScale, qOffset); std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({}, qScale, qOffset); return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -144,12 +152,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest1Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {0}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({4}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({4}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -157,6 +164,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest1Dim( 3, 4 }, qScale, qOffset); + std::vector<int> axis = {0}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 4, 3, 2, 1 @@ -165,10 +174,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest1Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -178,12 +188,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest2Dim1Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2,2}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2,2}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -191,6 +200,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest2Dim1Axis( 3, 4 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 2, 1, 4, 3 @@ -199,10 +210,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest2Dim1Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -212,12 +224,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest2Dim2Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1, 0}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2,2}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({2}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2,2}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -225,6 +236,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest2Dim2Axis( 3, 4 }, qScale, qOffset); + std::vector<int> axis = {1,0}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 4, 3, 2, 1 @@ -233,10 +246,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest2Dim2Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -246,12 +260,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim1Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 3, 4}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 3, 4}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -263,6 +276,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim1Axis( 21, 22, 23, 24 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 9, 10, 11, 12, 5, 6, 7, 8, @@ -275,10 +290,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim1Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -288,12 +304,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim2Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {0, 1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 3, 4}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({2}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 3, 4}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -305,6 +320,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim2Axis( 21, 22, 23, 24 }, qScale, qOffset); + std::vector<int> axis = {0, 1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 21, 22, 23, 24, 17, 18, 19, 20, @@ -317,10 +334,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim2Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -330,14 +348,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim3Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1, 0, 2}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 3, 4}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({3}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 3, 4}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -349,6 +364,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim3Axis( 21, 22, 23, 24 }, qScale, qOffset); + std::vector<int> axis = {1, 0, 2}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 24, 23, 22, 21, 20, 19, 18, 17, @@ -361,10 +378,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest3Dim3Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -374,14 +392,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim1Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {0}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 2, 2, 3}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 2, 2, 3}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -395,6 +410,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim1Axis( 22, 23, 24 }, qScale, qOffset); + std::vector<int> axis = {0}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 13, 14, 15, 16, 17, 18, @@ -409,10 +426,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim1Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -422,14 +440,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim2Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {0, 1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 2, 2, 3}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({2}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 2, 2, 3}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -443,6 +458,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim2Axis( 22, 23, 24 }, qScale, qOffset); + std::vector<int> axis = {0, 1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 19, 20, 21, 22, 23, 24, @@ -457,10 +474,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim2Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -470,14 +488,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim3Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {0, 1, 2}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 2, 2, 3}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({3}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 2, 2, 3}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -491,6 +506,8 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim3Axis( 22, 23, 24 }, qScale, qOffset); + std::vector<int> axis = {0, 1, 2}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 22, 23, 24, 19, 20, 21, @@ -505,10 +522,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim3Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -518,14 +536,11 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim4Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {0, 1, 2, 3}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 2, 2, 3}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({4}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 2, 2, 3}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -539,24 +554,27 @@ LayerTestResult<T, 2> ReverseV2SimpleTest4Dim4Axis( 22, 23, 24 }, qScale, qOffset); + std::vector<int> axis = {0, 1, 2, 3}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ - 24, 23, 22, - 21, 20, 19, - 18, 17, 16, - 15, 14, 13, - 12, 11, 10, - 9, 8, 7, - 6, 5, 4, - 3, 2, 1 - }, qScale, qOffset); + 24, 23, 22, + 21, 20, 19, + 18, 17, 16, + 15, 14, 13, + 12, 11, 10, + 9, 8, 7, + 6, 5, 4, + 3, 2, 1 + }, qScale, qOffset); return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -566,13 +584,11 @@ LayerTestResult<T, 2> ReverseV2EvenRowOddColTest2Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 3}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 3}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -580,6 +596,8 @@ LayerTestResult<T, 2> ReverseV2EvenRowOddColTest2Dim( 4, 5, 6 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 3, 2, 1, 6, 5, 4 @@ -588,10 +606,11 @@ LayerTestResult<T, 2> ReverseV2EvenRowOddColTest2Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -601,14 +620,11 @@ LayerTestResult<T, 2> ReverseV2EvenRowOddColTest3Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 3, 1}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 3, 1}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -616,6 +632,8 @@ LayerTestResult<T, 2> ReverseV2EvenRowOddColTest3Dim( 4, 5, 6 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 3, 2, 1, 6, 5, 4 @@ -624,10 +642,11 @@ LayerTestResult<T, 2> ReverseV2EvenRowOddColTest3Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -637,14 +656,11 @@ LayerTestResult<T, 2> ReverseV2EvenRowEvenColTest2Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 4}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 4}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -652,6 +668,8 @@ LayerTestResult<T, 2> ReverseV2EvenRowEvenColTest2Dim( 5, 6, 7, 8 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 4, 3, 2, 1, 8, 7, 6, 5 @@ -660,10 +678,11 @@ LayerTestResult<T, 2> ReverseV2EvenRowEvenColTest2Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -673,14 +692,11 @@ LayerTestResult<T, 2> ReverseV2EvenRowEvenColTest3Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 4, 1}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 4, 1}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -688,6 +704,8 @@ LayerTestResult<T, 2> ReverseV2EvenRowEvenColTest3Dim( 5, 6, 7, 8 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 4, 3, 2, 1, 8, 7, 6, 5 @@ -696,10 +714,11 @@ LayerTestResult<T, 2> ReverseV2EvenRowEvenColTest3Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -709,14 +728,11 @@ LayerTestResult<T, 2> ReverseV2OddRowOddColTest2Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({3, 3}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({3, 3}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -725,6 +741,8 @@ LayerTestResult<T, 2> ReverseV2OddRowOddColTest2Dim( 7, 8, 9 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 3, 2, 1, 6, 5, 4, @@ -734,10 +752,11 @@ LayerTestResult<T, 2> ReverseV2OddRowOddColTest2Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -747,14 +766,11 @@ LayerTestResult<T, 2> ReverseV2OddRowOddColTest3Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({3, 3, 1}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({3, 3, 1}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -763,6 +779,8 @@ LayerTestResult<T, 2> ReverseV2OddRowOddColTest3Dim( 7, 8, 9 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 3, 2, 1, 6, 5, 4, @@ -772,10 +790,11 @@ LayerTestResult<T, 2> ReverseV2OddRowOddColTest3Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -785,14 +804,11 @@ LayerTestResult<T, 2> ReverseV2OddRowEvenColTest2Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({3, 4}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({3, 4}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -801,6 +817,8 @@ LayerTestResult<T, 2> ReverseV2OddRowEvenColTest2Dim( 9, 10, 11, 12 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 4, 3, 2, 1, 8, 7, 6, 5, @@ -810,10 +828,11 @@ LayerTestResult<T, 2> ReverseV2OddRowEvenColTest2Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -823,14 +842,11 @@ LayerTestResult<T, 2> ReverseV2OddRowEvenColTest3Dim( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({3, 4, 1}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({3, 4, 1}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -839,6 +855,8 @@ LayerTestResult<T, 2> ReverseV2OddRowEvenColTest3Dim( 9, 10, 11, 12 }, qScale, qOffset); + std::vector<int> axis = {1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 4, 3, 2, 1, 8, 7, 6, 5, @@ -848,10 +866,11 @@ LayerTestResult<T, 2> ReverseV2OddRowEvenColTest3Dim( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -861,14 +880,11 @@ LayerTestResult<T, 2> ReverseV2NegAxisTest2Dim1Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {-1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 4}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({1}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 4}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -876,6 +892,8 @@ LayerTestResult<T, 2> ReverseV2NegAxisTest2Dim1Axis( 5, 6, 7, 8, }, qScale, qOffset); + std::vector<int> axis = {-1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 4, 3, 2, 1, 8, 7, 6, 5 @@ -884,10 +902,11 @@ LayerTestResult<T, 2> ReverseV2NegAxisTest2Dim1Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -897,14 +916,11 @@ LayerTestResult<T, 2> ReverseV2NegAxisTest3Dim2Axis( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - // Simple test with default descriptor. No axes set so output is - // the same as input - auto descriptor = armnn::ReverseV2Descriptor(std::vector<int> {1, -1}); - float qScale = 1.0f; int32_t qOffset = 0; armnn::TensorInfo inputInfo({2, 4, 1}, ArmnnType, qScale, qOffset); + armnn::TensorInfo axisInfo({2}, armnn::DataType::Signed32, qScale, qOffset); armnn::TensorInfo outputInfo({2, 4, 1}, ArmnnType, qScale, qOffset); std::vector<T> input = armnnUtils::QuantizedVector<T>({ @@ -912,6 +928,8 @@ LayerTestResult<T, 2> ReverseV2NegAxisTest3Dim2Axis( 5, 6, 7, 8, }, qScale, qOffset); + std::vector<int> axis = {1, -1}; + std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({ 4, 3, 2, 1, 8, 7, 6, 5 @@ -920,10 +938,11 @@ LayerTestResult<T, 2> ReverseV2NegAxisTest3Dim2Axis( return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory, memoryManager, tensorHandleFactory, - descriptor, input, + axis, outputExpected, inputInfo, + axisInfo, outputInfo); } @@ -1081,4 +1100,4 @@ template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 2> ReverseV2SimpleTest2Dim2Axis<armnn::DataType::QSymmS16>( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::ITensorHandleFactory& tensorHandleFactory);
\ No newline at end of file + const armnn::ITensorHandleFactory& tensorHandleFactory); |