diff options
| author | Matthew Bentham <matthew.bentham@arm.com> | 2019-05-13 10:02:45 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-13 16:41:09 +0000 |
| commit | acad04e3cb6abcdd9a3fcf4584db1cbedb52cb47 (patch) | |
| tree | 3e1497034566686e0648b1b17cbd0e8f72e91a94 | |
| parent | 49cb7d0568b7d4c81889a1791a4ca4e6bd5c8f32 (diff) | |
| download | armnn-acad04e3cb6abcdd9a3fcf4584db1cbedb52cb47.tar.gz | |
MLCE-101 Add dilation parameter to serializer
Change-Id: I8142e179d38c7a2a9163cf3d30bd1f411e8e109c
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
| -rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 2 | ||||
| -rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 4 | ||||
| -rw-r--r-- | src/armnnSerializer/Serializer.cpp | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index cbded60f93..8b790f7b04 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -980,6 +980,8 @@ void Deserializer::ParseConvolution2d(GraphPtr graph, unsigned int layerIndex) descriptor.m_PadBottom = serializerDescriptor->padBottom(); descriptor.m_StrideX = serializerDescriptor->strideX(); descriptor.m_StrideY = serializerDescriptor->strideY();; + descriptor.m_DilationX = serializerDescriptor->dilationX(); + descriptor.m_DilationY = serializerDescriptor->dilationY();; descriptor.m_BiasEnabled = serializerDescriptor->biasEnabled();; descriptor.m_DataLayout = ToDataLayout(serializerDescriptor->dataLayout()); diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index e8d72fc997..0419c4b883 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -172,6 +172,8 @@ table Convolution2dDescriptor { padBottom:uint; strideX:uint; strideY:uint; + dilationX:uint = 1; + dilationY:uint = 1; biasEnabled:bool = false; dataLayout:DataLayout = NCHW; } @@ -296,6 +298,8 @@ table DepthwiseConvolution2dDescriptor { padBottom:uint; strideX:uint; strideY:uint; + dilationX:uint = 1; + dilationY:uint = 1; biasEnabled:bool = false; dataLayout:DataLayout = NCHW; } diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 0b8ad06d18..865ed7af51 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -237,6 +237,8 @@ void SerializerVisitor::VisitConvolution2dLayer(const armnn::IConnectableLayer* descriptor.m_PadBottom, descriptor.m_StrideX, descriptor.m_StrideY, + descriptor.m_DilationX, + descriptor.m_DilationY, descriptor.m_BiasEnabled, GetFlatBufferDataLayout(descriptor.m_DataLayout)); auto flatBufferWeightsConstTensorInfo = CreateConstTensorInfo(weights); @@ -272,6 +274,8 @@ void SerializerVisitor::VisitDepthwiseConvolution2dLayer(const armnn::IConnectab descriptor.m_PadBottom, descriptor.m_StrideX, descriptor.m_StrideY, + descriptor.m_DilationX, + descriptor.m_DilationY, descriptor.m_BiasEnabled, GetFlatBufferDataLayout(descriptor.m_DataLayout)); |