aboutsummaryrefslogtreecommitdiff
path: root/src/armnnUtils
diff options
context:
space:
mode:
authorMatthew Sloyan <matthew.sloyan@arm.com>2021-10-18 13:07:49 +0100
committerMatthew Sloyan <matthew.sloyan@arm.com>2021-10-20 16:03:04 +0100
commit5d7b0a314b3e354a6cbcf15f5dd78b50f1e02774 (patch)
tree3d844c4575193ffddfe3a17c51cb808c9f16ddb0 /src/armnnUtils
parent73010788725f8f07efb6df20711ece712ee213ea (diff)
downloadarmnn-5d7b0a314b3e354a6cbcf15f5dd78b50f1e02774.tar.gz
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 <matthew.sloyan@arm.com> Change-Id: I10cdd354ca5f1c748730f92ffdb36bf810f83c8e
Diffstat (limited to 'src/armnnUtils')
-rw-r--r--src/armnnUtils/DataLayoutIndexed.cpp6
1 files changed, 6 insertions, 0 deletions
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<int>(dataLayout)));