IVGCVSW-2710 Add Serializer and Deserializer for StridedSlice
Change-Id: I6e8198a2aa5f8c56f00ccf9b4d98fcd208755654
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60604f8..185bdad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -615,6 +615,7 @@
src/armnnDeserializer/test/DeserializeResizeBilinear.cpp
src/armnnDeserializer/test/DeserializeRsqrt.cpp
src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp
+ src/armnnDeserializer/test/DeserializeStridedSlice.cpp
src/armnnDeserializer/test/DeserializeSubtraction.cpp
src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp
src/armnnDeserializer/test/SchemaSerialize.s
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index 73c2042..e4c9bd6 100644
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -209,6 +209,7 @@
m_ParserFunctions[Layer_RsqrtLayer] = &Deserializer::ParseRsqrt;
m_ParserFunctions[Layer_SoftmaxLayer] = &Deserializer::ParseSoftmax;
m_ParserFunctions[Layer_SpaceToBatchNdLayer] = &Deserializer::ParseSpaceToBatchNd;
+ m_ParserFunctions[Layer_StridedSliceLayer] = &Deserializer::ParseStridedSlice;
m_ParserFunctions[Layer_SubtractionLayer] = &Deserializer::ParseSubtraction;
}
@@ -270,6 +271,8 @@
return graphPtr->layers()->Get(layerIndex)->layer_as_SoftmaxLayer()->base();
case Layer::Layer_SpaceToBatchNdLayer:
return graphPtr->layers()->Get(layerIndex)->layer_as_SpaceToBatchNdLayer()->base();
+ case Layer::Layer_StridedSliceLayer:
+ return graphPtr->layers()->Get(layerIndex)->layer_as_StridedSliceLayer()->base();
case Layer::Layer_SubtractionLayer:
return graphPtr->layers()->Get(layerIndex)->layer_as_SubtractionLayer()->base();
case Layer::Layer_NONE:
@@ -1642,6 +1645,51 @@
RegisterOutputSlots(graph, layerIndex, layer);
}
+void Deserializer::ParseStridedSlice(GraphPtr graph, unsigned int layerIndex)
+{
+ CHECK_LAYERS(graph, 0, layerIndex);
+
+ Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex);
+ CHECK_VALID_SIZE(inputs.size(), 1);
+
+ Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex);
+ CHECK_VALID_SIZE(outputs.size(), 1);
+
+ auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_StridedSliceLayer()->descriptor();
+
+ auto flatBufferBegin = flatBufferDescriptor->begin();
+ auto flatBufferEnd = flatBufferDescriptor->end();
+ auto flatBufferStride = flatBufferDescriptor->stride();
+
+ if (!(flatBufferBegin->Length() == flatBufferEnd->Length() &&
+ flatBufferBegin->Length() == flatBufferStride->Length()))
+ {
+ throw ParseException(boost::str(
+ boost::format("The size of the begin, end, and stride must be equal %1%") % CHECK_LOCATION().AsString()));
+ }
+
+ std::vector<int> begin(flatBufferBegin->begin(), flatBufferBegin->end());
+ std::vector<int> end(flatBufferEnd->begin(), flatBufferEnd->end());
+ std::vector<int> stride(flatBufferStride->begin(), flatBufferStride->end());
+
+ armnn::StridedSliceDescriptor descriptor(begin, end, stride);
+ descriptor.m_BeginMask = flatBufferDescriptor->beginMask();
+ descriptor.m_EndMask = flatBufferDescriptor->endMask();
+ descriptor.m_ShrinkAxisMask = flatBufferDescriptor->shrinkAxisMask();
+ descriptor.m_EllipsisMask = flatBufferDescriptor->ellipsisMask();
+ descriptor.m_NewAxisMask = flatBufferDescriptor->newAxisMask();
+ descriptor.m_DataLayout = ToDataLayout(flatBufferDescriptor->dataLayout());
+
+ auto layerName = GetLayerName(graph, layerIndex);
+ IConnectableLayer* layer = m_Network->AddStridedSliceLayer(descriptor, layerName.c_str());
+
+ armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]);
+ layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo);
+
+ RegisterInputSlots(graph, layerIndex, layer);
+ RegisterOutputSlots(graph, layerIndex, layer);
+}
+
void Deserializer::ParseSubtraction(GraphPtr graph, unsigned int layerIndex)
{
CHECK_LAYERS(graph, 0, layerIndex);
diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp
index 7595818..b45551f 100644
--- a/src/armnnDeserializer/Deserializer.hpp
+++ b/src/armnnDeserializer/Deserializer.hpp
@@ -95,6 +95,7 @@
void ParseRsqrt(GraphPtr graph, unsigned int layerIndex);
void ParseSoftmax(GraphPtr graph, unsigned int layerIndex);
void ParseSpaceToBatchNd(GraphPtr graph, unsigned int layerIndex);
+ void ParseStridedSlice(GraphPtr graph, unsigned int layerIndex);
void ParseSubtraction(GraphPtr graph, unsigned int layerIndex);
void RegisterOutputSlotOfConnection(uint32_t connectionIndex, armnn::IOutputSlot* slot);
diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md
index 42da558..a295676 100644
--- a/src/armnnDeserializer/DeserializerSupport.md
+++ b/src/armnnDeserializer/DeserializerSupport.md
@@ -30,6 +30,7 @@
* Rsqrt
* Softmax
* SpaceToBatchNd
+* StridedSlice
* Subtraction
More machine learning layers will be supported in future releases.
diff --git a/src/armnnDeserializer/test/DeserializeStridedSlice.cpp b/src/armnnDeserializer/test/DeserializeStridedSlice.cpp
new file mode 100644
index 0000000..7c27307
--- /dev/null
+++ b/src/armnnDeserializer/test/DeserializeStridedSlice.cpp
@@ -0,0 +1,181 @@
+//
+// Copyright © 2017 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#include <boost/test/unit_test.hpp>
+#include "ParserFlatbuffersSerializeFixture.hpp"
+#include "../Deserializer.hpp"
+
+#include <string>
+
+BOOST_AUTO_TEST_SUITE(Deserializer)
+
+struct StridedSliceFixture : public ParserFlatbuffersSerializeFixture
+{
+ explicit StridedSliceFixture(const std::string& inputShape,
+ const std::string& begin,
+ const std::string& end,
+ const std::string& stride,
+ const std::string& beginMask,
+ const std::string& endMask,
+ const std::string& shrinkAxisMask,
+ const std::string& ellipsisMask,
+ const std::string& newAxisMask,
+ const std::string& dataLayout,
+ const std::string& outputShape,
+ const std::string& dataType)
+ {
+ m_JsonString = R"(
+ {
+ inputIds: [0],
+ outputIds: [2],
+ layers: [
+ {
+ layer_type: "InputLayer",
+ layer: {
+ base: {
+ layerBindingId: 0,
+ base: {
+ index: 0,
+ layerName: "InputLayer",
+ layerType: "Input",
+ inputSlots: [{
+ index: 0,
+ connection: {sourceLayerIndex:0, outputSlotIndex:0 },
+ }],
+ outputSlots: [{
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + inputShape + R"(,
+ dataType: )" + dataType + R"(
+ }
+ }]
+ }
+ }
+ }
+ },
+ {
+ layer_type: "StridedSliceLayer",
+ layer: {
+ base: {
+ index: 1,
+ layerName: "StridedSliceLayer",
+ layerType: "StridedSlice",
+ inputSlots: [{
+ index: 0,
+ connection: {sourceLayerIndex:0, outputSlotIndex:0 },
+ }],
+ outputSlots: [{
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + outputShape + R"(,
+ dataType: )" + dataType + R"(
+ }
+ }]
+ },
+ descriptor: {
+ begin: )" + begin + R"(,
+ end: )" + end + R"(,
+ stride: )" + stride + R"(,
+ beginMask: )" + beginMask + R"(,
+ endMask: )" + endMask + R"(,
+ shrinkAxisMask: )" + shrinkAxisMask + R"(,
+ ellipsisMask: )" + ellipsisMask + R"(,
+ newAxisMask: )" + newAxisMask + R"(,
+ dataLayout: )" + dataLayout + R"(,
+ }
+ }
+ },
+ {
+ 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"(
+ },
+ }],
+ }
+ }
+ },
+ }
+ ]
+ }
+ )";
+ SetupSingleInputSingleOutput("InputLayer", "OutputLayer");
+ }
+};
+
+struct SimpleStridedSliceFixture : StridedSliceFixture
+{
+ SimpleStridedSliceFixture() : StridedSliceFixture("[ 3, 2, 3, 1 ]",
+ "[ 0, 0, 0, 0 ]",
+ "[ 3, 2, 3, 1 ]",
+ "[ 2, 2, 2, 1 ]",
+ "0",
+ "0",
+ "0",
+ "0",
+ "0",
+ "NCHW",
+ "[ 2, 1, 2, 1 ]",
+ "Float32") {}
+};
+
+BOOST_FIXTURE_TEST_CASE(SimpleStridedSliceFloat32, SimpleStridedSliceFixture)
+{
+ RunTest<4, armnn::DataType::Float32>(0,
+ {
+ 1.0f, 1.0f, 1.0f, 2.0f, 2.0f, 2.0f,
+ 3.0f, 3.0f, 3.0f, 4.0f, 4.0f, 4.0f,
+ 5.0f, 5.0f, 5.0f, 6.0f, 6.0f, 6.0f
+ },
+ {
+ 1.0f, 1.0f, 5.0f, 5.0f
+ });
+}
+
+struct StridedSliceMaskFixture : StridedSliceFixture
+{
+ StridedSliceMaskFixture() : StridedSliceFixture("[ 3, 2, 3, 1 ]",
+ "[ 1, 1, 1, 1 ]",
+ "[ 1, 1, 1, 1 ]",
+ "[ 1, 1, 1, 1 ]",
+ "15",
+ "15",
+ "0",
+ "0",
+ "0",
+ "NCHW",
+ "[ 3, 2, 3, 1 ]",
+ "Float32") {}
+};
+
+BOOST_FIXTURE_TEST_CASE(StridedSliceMaskFloat32, StridedSliceMaskFixture)
+{
+ RunTest<4, armnn::DataType::Float32>(0,
+ {
+ 1.0f, 1.0f, 1.0f, 2.0f, 2.0f, 2.0f,
+ 3.0f, 3.0f, 3.0f, 4.0f, 4.0f, 4.0f,
+ 5.0f, 5.0f, 5.0f, 6.0f, 6.0f, 6.0f
+ },
+ {
+ 1.0f, 1.0f, 1.0f, 2.0f, 2.0f, 2.0f,
+ 3.0f, 3.0f, 3.0f, 4.0f, 4.0f, 4.0f,
+ 5.0f, 5.0f, 5.0f, 6.0f, 6.0f, 6.0f
+ });
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index 9f1d8ec..ed3de83 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -107,7 +107,8 @@
BatchNormalization = 23,
Greater = 24,
ResizeBilinear = 25,
- Subtraction = 26
+ Subtraction = 26,
+ StridedSlice = 27
}
// Base layer table to be used as part of other layers
@@ -381,6 +382,23 @@
dataLayout:DataLayout;
}
+table StridedSliceLayer {
+ base:LayerBase;
+ descriptor:StridedSliceDescriptor;
+}
+
+table StridedSliceDescriptor {
+ begin:[int];
+ end:[int];
+ stride:[int];
+ beginMask:int;
+ endMask:int;
+ shrinkAxisMask:int;
+ ellipsisMask:int;
+ newAxisMask:int;
+ dataLayout:DataLayout;
+}
+
union Layer {
ActivationLayer,
AdditionLayer,
@@ -408,7 +426,8 @@
FloorLayer,
GreaterLayer,
ResizeBilinearLayer,
- SubtractionLayer
+ SubtractionLayer,
+ StridedSliceLayer
}
table AnyLayer {
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index 93231d0..9653908 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -588,6 +588,31 @@
CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_NormalizationLayer);
}
+void SerializerVisitor::VisitStridedSliceLayer(const armnn::IConnectableLayer* layer,
+ const armnn::StridedSliceDescriptor& stridedSliceDescriptor,
+ const char* name)
+{
+ auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_StridedSlice);
+
+ auto flatBufferDescriptor =
+ CreateStridedSliceDescriptor(m_flatBufferBuilder,
+ m_flatBufferBuilder.CreateVector(stridedSliceDescriptor.m_Begin),
+ m_flatBufferBuilder.CreateVector(stridedSliceDescriptor.m_End),
+ m_flatBufferBuilder.CreateVector(stridedSliceDescriptor.m_Stride),
+ stridedSliceDescriptor.m_BeginMask,
+ stridedSliceDescriptor.m_EndMask,
+ stridedSliceDescriptor.m_ShrinkAxisMask,
+ stridedSliceDescriptor.m_EllipsisMask,
+ stridedSliceDescriptor.m_NewAxisMask,
+ GetFlatBufferDataLayout(stridedSliceDescriptor.m_DataLayout));
+
+ auto flatBufferLayer = serializer::CreateStridedSliceLayer(m_flatBufferBuilder,
+ flatBufferBaseLayer,
+ flatBufferDescriptor);
+
+ CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_StridedSliceLayer);
+}
+
void SerializerVisitor::VisitSubtractionLayer(const armnn::IConnectableLayer* layer, const char* name)
{
auto fbSubtractionBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Subtraction);
diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp
index b6f5974..0dcacc8 100644
--- a/src/armnnSerializer/Serializer.hpp
+++ b/src/armnnSerializer/Serializer.hpp
@@ -147,6 +147,10 @@
const armnn::NormalizationDescriptor& normalizationDescriptor,
const char* name = nullptr) override;
+ void VisitStridedSliceLayer(const armnn::IConnectableLayer* layer,
+ const armnn::StridedSliceDescriptor& stridedSliceDescriptor,
+ const char* name = nullptr) override;
+
void VisitSubtractionLayer(const armnn::IConnectableLayer* layer,
const char* name = nullptr) override;
private:
diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md
index 141a6fa..713b35f 100644
--- a/src/armnnSerializer/SerializerSupport.md
+++ b/src/armnnSerializer/SerializerSupport.md
@@ -30,6 +30,7 @@
* Rsqrt
* Softmax
* SpaceToBatchNd
+* StridedSlice
* Subtraction
More machine learning layers will be supported in future releases.
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 572ee80..5a6806a 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -1290,4 +1290,47 @@
{0, 1});
}
+BOOST_AUTO_TEST_CASE(SerializeDeserializeStridedSlice)
+{
+ class VerifyStridedSliceName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy>
+ {
+ public:
+ void VisitStridedSliceLayer(const armnn::IConnectableLayer*,
+ const armnn::StridedSliceDescriptor& descriptor,
+ const char* name) override
+ {
+ BOOST_TEST(name == "StridedSliceLayer");
+ }
+ };
+
+ armnn::StridedSliceDescriptor desc({0, 0, 1, 0}, {1, 1, 1, 1}, {1, 1, 1, 1});
+ desc.m_EndMask = (1 << 4) - 1;
+ desc.m_ShrinkAxisMask = (1 << 1) | (1 << 2);
+ desc.m_DataLayout = armnn::DataLayout::NCHW;
+
+ const armnn::TensorInfo inputTensorInfo = armnn::TensorInfo({3, 2, 3, 1}, armnn::DataType::Float32);
+ const armnn::TensorInfo outputTensorInfo = armnn::TensorInfo({3, 1}, armnn::DataType::Float32);
+
+ armnn::INetworkPtr network = armnn::INetwork::Create();
+ armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0);
+ armnn::IConnectableLayer* const stridedSliceLayer = network->AddStridedSliceLayer(desc, "StridedSliceLayer");
+ armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0);
+
+ inputLayer->GetOutputSlot(0).Connect(stridedSliceLayer->GetInputSlot(0));
+ inputLayer->GetOutputSlot(0).SetTensorInfo(inputTensorInfo);
+ stridedSliceLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0));
+ stridedSliceLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo);
+
+ armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network));
+ BOOST_CHECK(deserializedNetwork);
+
+ VerifyStridedSliceName nameChecker;
+ deserializedNetwork->Accept(nameChecker);
+
+ CheckDeserializedNetworkAgainstOriginal(*network,
+ *deserializedNetwork,
+ {inputTensorInfo.GetShape()},
+ {outputTensorInfo.GetShape()});
+}
+
BOOST_AUTO_TEST_SUITE_END()