commit 0690265d83e5aa79bd174544a7b35330781619dd
author Cathal Corbett <cathal.corbett@arm.com> Thu Apr 14 17:55:11 2022 +0100
committer Cathal Corbett <cathal.corbett@arm.com> Thu May 05 16:10:06 2022 +0000
tree 2cb825017ee202ebcfa9c8428271a4dccaed72a4
parent 3a3a6bfaedc64fac3644c8fe88dbfc3947e2b3ab

IVGCVSW-6127 ConstTensorsAsInput: DepthwiseConvolution2d

!android-nn-driver:7418

 * Update Front-end and Tools.
 * Updated Serializer, Deserializer and unit tests to reflect this.
 * Updated TfLiteDelegate, TfLiteParser and OnnxParser.
 * Change NNDriver to new API.
 * Updated Ref.
 * Neon and Cl backend partially completed (Backend.cpp files).
 * Added dynamic or constant input EndToEnd tests.
 * Added ConstantTensorAsInputMemeberVariableRedirect Optimization.

Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: Ib18b6c10a093042e165e25237dc04a4c67ba82da

src/armnnSerializer/Serializer.cpp

diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index 3b9dfb0..99d1c2b 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -441,13 +441,10 @@
 
 void SerializerStrategy::SerializeDepthwiseConvolution2dLayer(const armnn::IConnectableLayer* layer,
                                                               const armnn::DepthwiseConvolution2dDescriptor& descriptor,
-                                                              const std::vector<armnn::ConstTensor>& constants,
                                                               const char* name)
 {
     IgnoreUnused(name);
 
-    const armnn::ConstTensor& weights = constants[0];
-
     auto fbBaseLayer  = CreateLayerBase(layer, serializer::LayerType::LayerType_DepthwiseConvolution2d);
     auto fbDescriptor = CreateDepthwiseConvolution2dDescriptor(m_flatBufferBuilder,
                                                                descriptor.m_PadLeft,
@@ -461,20 +458,9 @@
                                                                descriptor.m_BiasEnabled,
                                                                GetFlatBufferDataLayout(descriptor.m_DataLayout));
 
-    flatbuffers::Offset<serializer::ConstTensor> fbWeightsConstTensorInfo = CreateConstTensorInfo(weights);
-    flatbuffers::Offset<serializer::ConstTensor> fbBiasesConstTensorInfo;
-
-    if (constants.size() > 1)
-    {
-        const armnn::ConstTensor& biases = constants[1];
-        fbBiasesConstTensorInfo = CreateConstTensorInfo(biases);
-    }
-
     auto flatBufferLayer = CreateDepthwiseConvolution2dLayer(m_flatBufferBuilder,
                                                              fbBaseLayer,
-                                                             fbDescriptor,
-                                                             fbWeightsConstTensorInfo,
-                                                             fbBiasesConstTensorInfo);
+                                                             fbDescriptor);
 
     CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_DepthwiseConvolution2dLayer);
 }
@@ -2090,7 +2076,6 @@
                     static_cast<const armnn::DepthwiseConvolution2dDescriptor&>(descriptor);
             SerializeDepthwiseConvolution2dLayer(layer,
                                                  layerDescriptor,
-                                                 constants,
                                                  name);
             break;
         }