diff options
| author | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-09-08 13:05:51 +0100 |
|---|---|---|
| committer | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-10-01 15:27:01 +0100 |
| commit | b63a31170aee1d28267d83a4bc67b57708fb6b05 (patch) | |
| tree | 16cea0a872939be749b72f45ad125964439bc40e /src/armnnSerializer/Serializer.cpp | |
| parent | eb852bb9e45b1db42a26001ece11ec7cc1f2bbfe (diff) | |
| download | armnn-b63a31170aee1d28267d83a4bc67b57708fb6b05.tar.gz | |
IVGCVSW-6163 Add Conv3d FrontEnd and Ref Implementation
* Added front-end
* Added Reference workload
* Added Serializer & Deserializer support
* Added unit tests
* Added NDHWC DataLayout
Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: Iec4d39e7433b5334d52fa44cf8efc6bcd39319d8
Diffstat (limited to 'src/armnnSerializer/Serializer.cpp')
| -rw-r--r-- | src/armnnSerializer/Serializer.cpp | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 9a3a270de5..efaf9f81cd 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -397,6 +397,54 @@ void SerializerStrategy::SerializeConvolution2dLayer(const armnn::IConnectableLa CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_Convolution2dLayer); } +// Build FlatBuffer for Convolution2dLayer +void SerializerStrategy::SerializeConvolution3dLayer(const armnn::IConnectableLayer* layer, + const armnn::Convolution3dDescriptor& descriptor, + const std::vector<armnn::ConstTensor>& constants, + const char* name) +{ + IgnoreUnused(name); + + const armnn::ConstTensor weights = constants[0]; + + // Create FlatBuffer BaseLayer + auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Convolution2d); + + auto flatBufferDescriptor = CreateConvolution3dDescriptor(m_flatBufferBuilder, + descriptor.m_PadLeft, + descriptor.m_PadRight, + descriptor.m_PadTop, + descriptor.m_PadBottom, + descriptor.m_PadFront, + descriptor.m_PadBack, + descriptor.m_StrideX, + descriptor.m_StrideY, + descriptor.m_StrideZ, + descriptor.m_DilationX, + descriptor.m_DilationY, + descriptor.m_DilationZ, + descriptor.m_BiasEnabled, + GetFlatBufferDataLayout(descriptor.m_DataLayout)); + auto flatBufferWeightsConstTensorInfo = CreateConstTensorInfo(weights); + flatbuffers::Offset<serializer::ConstTensor> flatBufferBiasesConstTensorInfo; + + if (constants.size() > 1) + { + const armnn::ConstTensor biases = constants[1]; + flatBufferBiasesConstTensorInfo = CreateConstTensorInfo(biases); + } + + // Create the FlatBuffer Convolution2dLayer + auto flatBufferLayer = CreateConvolution3dLayer(m_flatBufferBuilder, + flatBufferBaseLayer, + flatBufferDescriptor, + flatBufferWeightsConstTensorInfo, + flatBufferBiasesConstTensorInfo); + + // Add the AnyLayer to the FlatBufferLayers + CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_Convolution3dLayer); +} + void SerializerStrategy::SerializeDepthToSpaceLayer(const armnn::IConnectableLayer* layer, const armnn::DepthToSpaceDescriptor& descriptor, const char* name) @@ -2054,6 +2102,16 @@ void SerializerStrategy::ExecuteStrategy(const armnn::IConnectableLayer* layer, name); break; } + case armnn::LayerType::Convolution3d : + { + const armnn::Convolution3dDescriptor& layerDescriptor = + static_cast<const armnn::Convolution3dDescriptor&>(descriptor); + SerializeConvolution3dLayer(layer, + layerDescriptor, + constants, + name); + break; + } case armnn::LayerType::DepthToSpace : { const armnn::DepthToSpaceDescriptor& layerDescriptor = |