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/armnn/Network.cpp | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'src/armnn/Network.cpp') diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 99d7b96ec2..b516d519d5 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -114,11 +114,9 @@ IConnectableLayer* INetwork::AddConvolution2dLayer(const Convolution2dDescriptor IConnectableLayer* INetwork::AddConvolution3dLayer(const Convolution3dDescriptor& convolution3dDescriptor, - const ConstTensor& weights, - const Optional& biases, const char* name) { - return pNetworkImpl->AddConvolution3dLayer(convolution3dDescriptor, weights, biases, name); + return pNetworkImpl->AddConvolution3dLayer(convolution3dDescriptor, name); } @@ -1934,25 +1932,9 @@ IConnectableLayer* NetworkImpl::AddConvolution2dLayer(const Convolution2dDescrip } IConnectableLayer* NetworkImpl::AddConvolution3dLayer(const Convolution3dDescriptor& convolution3dDescriptor, - const ConstTensor& weights, - const Optional& biases, const char* name) { - if (convolution3dDescriptor.m_BiasEnabled && !biases.has_value()) - { - throw InvalidArgumentException("AddConvolution2dLayer: biases cannot be empty"); - } - - const auto layer = m_Graph->AddLayer(convolution3dDescriptor, name); - - layer->m_Weight = std::make_shared(weights); - - if (convolution3dDescriptor.m_BiasEnabled) - { - layer->m_Bias = std::make_shared(biases.value()); - } - - return layer; + return m_Graph->AddLayer(convolution3dDescriptor, name); } IConnectableLayer* NetworkImpl::AddDepthToSpaceLayer(const DepthToSpaceDescriptor& depthToSpaceDescriptor, -- cgit v1.2.1