IVGCVSW-7879 Change REVERSE_V2 from LayerWithParameters with 1 input, to Layer with 2 inputs
* Changing ReverseV2 to use two inputs
* This is required by the backends
* The ReverseV2Descriptor was removed
* Tests updated
* Added a Run<> templatefor inputs with different data types
Signed-off-by: Tracy Narine <tracy.narine@arm.com>
Change-Id: I22f947de829b4b3da6bda3a74f4ffdef4052cc25
diff --git a/src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp
index 586b831..3cfd614 100644
--- a/src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/ReverseV2TestImpl.cpp
@@ -23,23 +23,25 @@
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 @@
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 @@
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 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -115,26 +122,27 @@
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 @@
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 @@
3, 4
}, qScale, qOffset);
+ std::vector<int> axis = {0};
+
std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({
4, 3,
2, 1
@@ -165,10 +174,11 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -178,12 +188,11 @@
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 @@
3, 4
}, qScale, qOffset);
+ std::vector<int> axis = {1};
+
std::vector<T> outputExpected = armnnUtils::QuantizedVector<T>({
2, 1,
4, 3
@@ -199,10 +210,11 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -212,12 +224,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -246,12 +260,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -288,12 +304,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -330,14 +348,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -374,14 +392,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -422,14 +440,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -470,14 +488,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -518,14 +536,11 @@
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 @@
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 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -601,14 +620,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -637,14 +656,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -673,14 +692,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -709,14 +728,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -747,14 +766,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -785,14 +804,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -823,14 +842,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -861,14 +880,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -897,14 +916,11 @@
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 @@
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 @@
return ReverseV2TestImpl<ArmnnType, T, 2>(workloadFactory,
memoryManager,
tensorHandleFactory,
- descriptor,
input,
+ axis,
outputExpected,
inputInfo,
+ axisInfo,
outputInfo);
}
@@ -1081,4 +1100,4 @@
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);