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/armnnDeserializer/test/DeserializeReverseV2.cpp b/src/armnnDeserializer/test/DeserializeReverseV2.cpp
index 73816f8..b6f207c 100644
--- a/src/armnnDeserializer/test/DeserializeReverseV2.cpp
+++ b/src/armnnDeserializer/test/DeserializeReverseV2.cpp
@@ -14,61 +14,96 @@
{
struct ReverseV2Fixture : public ParserFlatbuffersSerializeFixture
{
- explicit ReverseV2Fixture(const std::string& inputShape,
+ explicit ReverseV2Fixture(const std::string& inputShape0,
+ const std::string& inputShape1,
const std::string& outputShape,
- const std::string& dataType,
- const std::string& axis)
+ const std::string& dataType0,
+ const std::string& dataType1)
{
m_JsonString = R"(
{
- inputIds: [0],
- outputIds: [2],
- layers: [
+ inputIds: [0, 1],
+ outputIds: [3],
+ layers:
+ [
{
layer_type: "InputLayer",
layer: {
- base: {
- layerBindingId: 0,
- base: {
- index: 0,
- layerName: "InputLayer",
- layerType: "Input",
- inputSlots: [{
+ base: {
+ layerBindingId: 0,
+ base: {
index: 0,
- connection: {sourceLayerIndex:0, outputSlotIndex:0 },
- }],
- outputSlots: [{
- index: 0,
- tensorInfo: {
- dimensions: )" + inputShape + R"(,
- dataType: )" + dataType + R"(
- }
- }]
- }
- }
+ layerName: "InputLayer0",
+ layerType: "Input",
+ inputSlots:
+ [{
+ index: 0,
+ connection: {sourceLayerIndex:0, outputSlotIndex:0 },
+ }],
+ outputSlots:
+ [ {
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + inputShape0 + R"(,
+ dataType: )" + dataType0 + R"(
+ }
+ }]
+ }
+ }
}
},
{
- layer_type: "ReverseV2Layer",
+ layer_type: "InputLayer",
layer: {
- base: {
- index: 1,
- layerName: "ReverseV2Layer",
- layerType: "ReverseV2",
- inputSlots: [{
- index: 0,
- connection: {sourceLayerIndex:0, outputSlotIndex:0 },
- }],
- outputSlots: [{
- index: 0,
- tensorInfo: {
- dimensions: )" + outputShape + R"(,
- dataType: )" + dataType + R"(
+ base: {
+ layerBindingId: 1,
+ base: {
+ index:1,
+ layerName: "InputLayer1",
+ layerType: "Input",
+ inputSlots:
+ [{
+ index: 0,
+ connection: {sourceLayerIndex:0, outputSlotIndex:0 },
+ }],
+ outputSlots:
+ [{
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + inputShape1 + R"(,
+ dataType: )" + dataType1 + R"(
+ }
+ }]
}
+ }
+ }
+ },
+ {
+ layer_type: "ReverseV2Layer",
+ layer : {
+ base: {
+ index:2,
+ layerName: "ReverseV2Layer",
+ layerType: "ReverseV2",
+ inputSlots:
+ [
+ {
+ index: 0,
+ connection: {sourceLayerIndex:0, outputSlotIndex:0 },
+ },
+ {
+ index: 1,
+ connection: {sourceLayerIndex:1, outputSlotIndex:0 },
+ }
+ ],
+ outputSlots:
+ [{
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + outputShape + R"(,
+ dataType: )" + dataType0 + R"(
+ }
}]
- },
- descriptor: {
- axis: )" + axis + R"(
}
}
},
@@ -76,31 +111,32 @@
layer_type: "OutputLayer",
layer: {
base:{
- layerBindingId: 2,
- base: {
- index: 2,
- layerName: "OutputLayer",
- layerType: "Output",
- inputSlots: [{
- index: 0,
- connection: {sourceLayerIndex:1, outputSlotIndex:0 },
- }],
- outputSlots: [{
- index: 0,
- tensorInfo: {
- dimensions: )" + outputShape + R"(,
- dataType: )" + dataType + R"(
- },
- }],
- }
+ layerBindingId: 0,
+ base: {
+ index: 3,
+ layerName: "OutputLayer",
+ layerType: "Output",
+ inputSlots:
+ [{
+ index: 0,
+ connection: {sourceLayerIndex:2, outputSlotIndex:0 },
+ }],
+ outputSlots:
+ [{
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + outputShape + R"(,
+ dataType: )" + dataType0 + R"(
+ }
+ }]
+ }
}
}
}
]
- }
- )";
+ } )";
- SetupSingleInputSingleOutput("InputLayer", "OutputLayer");
+ Setup();
}
};
@@ -109,65 +145,155 @@
struct SimpleReverseV2FixtureFloat32 : ReverseV2Fixture
{
SimpleReverseV2FixtureFloat32()
- : ReverseV2Fixture("[ 2, 2 ]",
- "[ 2, 2 ]",
- "Float32",
- "[1]")
+ : ReverseV2Fixture("[ 2, 2 ]",
+ "[ 1 ]",
+ "[ 2, 2 ]",
+ "Float32",
+ "Signed32")
{}
};
TEST_CASE_FIXTURE(SimpleReverseV2FixtureFloat32, "SimpleReverseV2TestFloat32")
{
- RunTest<4, armnn::DataType::Float32>(
+ RunTest<2, armnn::DataType::Float32, armnn::DataType::Signed32, armnn::DataType::Float32>(
0,
- { 1.0f, 2.0f,
- 3.0f, 4.0f },
- { 2.0f, 1.0f,
- 4.0f, 3.0f }
- );
- }
-
- struct SimpleReverseV2FixtureFloat32ZeroAxis : ReverseV2Fixture
- {
- SimpleReverseV2FixtureFloat32ZeroAxis()
- : ReverseV2Fixture("[ 2, 2 ]",
- "[ 2, 2 ]",
- "Float32",
- "[0]")
- {}
- };
-
- TEST_CASE_FIXTURE(SimpleReverseV2FixtureFloat32ZeroAxis, "SimpleReverseV2TestFloat32ZeroAxis")
- {
- RunTest<4, armnn::DataType::Float32>(
- 0,
- { 1.0f, 2.0f,
- 3.0f, 4.0f },
- { 3.0f, 4.0f,
- 1.0f, 2.0f }
+ {
+ {
+ "InputLayer0",
+ { 1.0f, 2.0f,
+ 3.0f, 4.0f }
+ }
+ },
+ {
+ {
+ "InputLayer1",
+ { 1 }
+ }
+ },
+ {
+ {
+ "OutputLayer",
+ { 2.0f, 1.0f,
+ 4.0f, 3.0f }
+ }
+ }
);
}
- struct SimpleReverseV2FixtureFloat32NegativeAxis : ReverseV2Fixture
+ struct SimpleReverseV2FixtureFloat32OtherAxis : ReverseV2Fixture
{
- SimpleReverseV2FixtureFloat32NegativeAxis()
- : ReverseV2Fixture("[ 3, 3 ]",
- "[ 3, 3 ]",
- "Float32",
- "[-1]")
+ SimpleReverseV2FixtureFloat32OtherAxis()
+ : ReverseV2Fixture("[ 2, 2 ]",
+ "[ 1 ]",
+ "[ 2, 2 ]",
+ "Float32",
+ "Signed32")
{}
};
- TEST_CASE_FIXTURE(SimpleReverseV2FixtureFloat32NegativeAxis, "SimpleReverseV2TestFloat32NegativeAxis")
+ TEST_CASE_FIXTURE(SimpleReverseV2FixtureFloat32OtherAxis, "SimpleReverseV2FixtureFloat32OtherAxis")
{
- RunTest<4, armnn::DataType::Float32>(
- 0,
- { 1.0f, 2.0f, 3.0f,
- 4.0f, 5.0f, 6.0f,
- 7.0f, 8.0f, 9.0f },
- { 3.0f, 2.0f, 1.0f,
- 6.0f, 5.0f, 4.0f,
- 9.0f, 8.0f, 7.0f }
+ RunTest<2, armnn::DataType::Float32, armnn::DataType::Signed32, armnn::DataType::Float32>(
+ 0,
+ {
+ {
+ "InputLayer0",
+ { 1.0f, 2.0f,
+ 3.0f, 4.0f }
+ }
+ },
+ {
+ {
+ "InputLayer1",
+ { 1 }
+ }
+ },
+ {
+ {
+ "OutputLayer",
+ { 2.0f, 1.0f,
+ 4.0f, 3.0f }
+ }
+ }
+ );
+ }
+
+ struct SimpleReverseV2FixtureFloat32NegativeFirstAxis : ReverseV2Fixture
+ {
+ SimpleReverseV2FixtureFloat32NegativeFirstAxis()
+ : ReverseV2Fixture("[ 2, 2 ]",
+ "[ 1 ]",
+ "[ 2, 2 ]",
+ "Float32",
+ "Signed32")
+ {}
+ };
+
+ TEST_CASE_FIXTURE(SimpleReverseV2FixtureFloat32NegativeFirstAxis, "SimpleReverseV2FixtureFloat32NegativeFirstAxis")
+ {
+ RunTest<2, armnn::DataType::Float32, armnn::DataType::Signed32, armnn::DataType::Float32>(
+ 0,
+ {
+ {
+ "InputLayer0",
+ { 1.0f, 2.0f,
+ 3.0f, 4.0f }
+ }
+ },
+ {
+ {
+ "InputLayer1",
+ { -2 }
+ }
+ },
+ {
+ {
+ "OutputLayer",
+ { 3.0f, 4.0f,
+ 1.0f, 2.0f }
+ }
+ }
+ );
+ }
+
+ struct SimpleReverseV2FixtureFloat32NegativeSecondAxis : ReverseV2Fixture
+ {
+ SimpleReverseV2FixtureFloat32NegativeSecondAxis()
+ : ReverseV2Fixture("[ 3, 3 ]",
+ "[ 1 ]",
+ "[ 3, 3 ]",
+ "Float32",
+ "Signed32")
+ {}
+ };
+
+ TEST_CASE_FIXTURE(SimpleReverseV2FixtureFloat32NegativeSecondAxis,
+ "SimpleReverseV2FixtureFloat32NegativeSecondAxis")
+ {
+ RunTest<2, armnn::DataType::Float32, armnn::DataType::Signed32, armnn::DataType::Float32>(
+ 0,
+ {
+ {
+ "InputLayer0",
+ { 1.0f, 2.0f, 3.0f,
+ 4.0f, 5.0f, 6.0f,
+ 7.0f, 8.0f, 9.0f }
+ }
+ },
+ {
+ {
+ "InputLayer1",
+ { -1 }
+ }
+ },
+ {
+ {
+ "OutputLayer",
+ { 3.0f, 2.0f, 1.0f,
+ 6.0f, 5.0f, 4.0f,
+ 9.0f, 8.0f, 7.0f }
+ }
+ }
);
}
@@ -175,38 +301,55 @@
{
SimpleReverseV2FixtureFloat32ThreeAxis()
: ReverseV2Fixture("[ 3, 3, 3 ]",
+ "[ 3 ]",
"[ 3, 3, 3 ]",
"Float32",
- "[0, 2, 1]")
+ "Signed32")
{}
};
TEST_CASE_FIXTURE(SimpleReverseV2FixtureFloat32ThreeAxis, "SimpleReverseV2TestFloat32ThreeAxis")
{
- RunTest<4, armnn::DataType::Float32>(
- 0,
- { 1.0f, 2.0f, 3.0f,
- 4.0f, 5.0f, 6.0f,
- 7.0f, 8.0f, 9.0f,
+ RunTest<2, armnn::DataType::Float32, armnn::DataType::Signed32, armnn::DataType::Float32>(
+ 0,
+ {
+ {
+ "InputLayer0",
+ { 1.0f, 2.0f, 3.0f,
+ 4.0f, 5.0f, 6.0f,
+ 7.0f, 8.0f, 9.0f,
- 11.0f, 12.0f, 13.0f,
- 14.0f, 15.0f, 16.0f,
- 17.0f, 18.0f, 19.0f,
+ 11.0f, 12.0f, 13.0f,
+ 14.0f, 15.0f, 16.0f,
+ 17.0f, 18.0f, 19.0f,
- 21.0f, 22.0f, 23.0f,
- 24.0f, 25.0f, 26.0f,
- 27.0f, 28.0f, 29.0f },
- { 29.0f, 28.0f, 27.0f,
- 26.0f, 25.0f, 24.0f,
- 23.0f, 22.0f, 21.0f,
+ 21.0f, 22.0f, 23.0f,
+ 24.0f, 25.0f, 26.0f,
+ 27.0f, 28.0f, 29.0f },
+ }
+ },
+ {
+ {
+ "InputLayer1",
+ { 0, 2, 1 }
+ }
+ },
+ {
+ {
+ "OutputLayer",
+ { 29.0f, 28.0f, 27.0f,
+ 26.0f, 25.0f, 24.0f,
+ 23.0f, 22.0f, 21.0f,
- 19.0f, 18.0f, 17.0f,
- 16.0f, 15.0f, 14.0f,
- 13.0f, 12.0f, 11.0f,
+ 19.0f, 18.0f, 17.0f,
+ 16.0f, 15.0f, 14.0f,
+ 13.0f, 12.0f, 11.0f,
- 9.0f, 8.0f, 7.0f,
- 6.0f, 5.0f, 4.0f,
- 3.0f, 2.0f, 1.0f }
+ 9.0f, 8.0f, 7.0f,
+ 6.0f, 5.0f, 4.0f,
+ 3.0f, 2.0f, 1.0f }
+ }
+ }
);
}
@@ -214,38 +357,55 @@
{
SimpleReverseV2FixtureQuantisedAsymm8ThreeAxis()
: ReverseV2Fixture("[ 3, 3, 3 ]",
+ "[ 3 ]",
"[ 3, 3, 3 ]",
"QuantisedAsymm8",
- "[0, 2, 1]")
+ "Signed32")
{}
};
TEST_CASE_FIXTURE(SimpleReverseV2FixtureQuantisedAsymm8ThreeAxis, "SimpleReverseV2TestQuantisedAsymm8ThreeAxis")
{
- RunTest<4, armnn::DataType::QAsymmU8>(
- 0,
- { 1, 2, 3,
- 4, 5, 6,
- 7, 8, 9,
+ RunTest<2, armnn::DataType::QAsymmU8, armnn::DataType::Signed32, armnn::DataType::QAsymmU8>(
+ 0,
+ {
+ {
+ "InputLayer0",
+ { 1, 2, 3,
+ 4, 5, 6,
+ 7, 8, 9,
- 11, 12, 13,
- 14, 15, 16,
- 17, 18, 19,
+ 11, 12, 13,
+ 14, 15, 16,
+ 17, 18, 19,
- 21, 22, 23,
- 24, 25, 26,
- 27, 28, 29 },
- { 29, 28, 27,
- 26, 25, 24,
- 23, 22, 21,
+ 21, 22, 23,
+ 24, 25, 26,
+ 27, 28, 29 },
+ }
+ },
+ {
+ {
+ "InputLayer1",
+ { 0, 2, 1 }
+ }
+ },
+ {
+ {
+ "OutputLayer",
+ { 29, 28, 27,
+ 26, 25, 24,
+ 23, 22, 21,
- 19, 18, 17,
- 16, 15, 14,
- 13, 12, 11,
+ 19, 18, 17,
+ 16, 15, 14,
+ 13, 12, 11,
- 9, 8, 7,
- 6, 5, 4,
- 3, 2, 1 }
+ 9, 8, 7,
+ 6, 5, 4,
+ 3, 2, 1 }
+ }
+ }
);
}
}