From 5d7b0a314b3e354a6cbcf15f5dd78b50f1e02774 Mon Sep 17 00:00:00 2001 From: Matthew Sloyan Date: Mon, 18 Oct 2021 13:07:49 +0100 Subject: Add ConstTensorsAsInput support for Conv3d * Constant weights and biases are now stored as Constant layers. * Updated Serializer, Deserializer and unit tests to reflect this. * Updated TfLiteParser. * Updated Ref backend to handle constant weights and bias as inputs rather than reading from member variables. * Added Conv3d EndToEnd test. * Added NCDHW DataLayout and unit tests. Signed-off-by: Matthew Sloyan Change-Id: I10cdd354ca5f1c748730f92ffdb36bf810f83c8e --- src/armnnUtils/DataLayoutIndexed.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/armnnUtils') diff --git a/src/armnnUtils/DataLayoutIndexed.cpp b/src/armnnUtils/DataLayoutIndexed.cpp index c1c98fc0fd..01505a0a31 100644 --- a/src/armnnUtils/DataLayoutIndexed.cpp +++ b/src/armnnUtils/DataLayoutIndexed.cpp @@ -31,6 +31,12 @@ DataLayoutIndexed::DataLayoutIndexed(armnn::DataLayout dataLayout) m_WidthIndex = 3; m_ChannelsIndex = 4; break; + case armnn::DataLayout::NCDHW: + m_ChannelsIndex = 1; + m_DepthIndex = 2; + m_HeightIndex = 3; + m_WidthIndex = 4; + break; default: throw armnn::InvalidArgumentException("Unknown DataLayout value: " + std::to_string(static_cast(dataLayout))); -- cgit v1.2.1