diff options
| author | Cathal Corbett <cathal.corbett@arm.com> | 2022-04-14 17:55:11 +0100 |
|---|---|---|
| committer | Cathal Corbett <cathal.corbett@arm.com> | 2022-05-05 16:10:06 +0000 |
| commit | 0690265d83e5aa79bd174544a7b35330781619dd (patch) | |
| tree | 2cb825017ee202ebcfa9c8428271a4dccaed72a4 /src/backends/aclCommon/ArmComputeSubgraphUtils.hpp | |
| parent | 3a3a6bfaedc64fac3644c8fe88dbfc3947e2b3ab (diff) | |
| download | armnn-0690265d83e5aa79bd174544a7b35330781619dd.tar.gz | |
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
Diffstat (limited to 'src/backends/aclCommon/ArmComputeSubgraphUtils.hpp')
| -rw-r--r-- | src/backends/aclCommon/ArmComputeSubgraphUtils.hpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/backends/aclCommon/ArmComputeSubgraphUtils.hpp b/src/backends/aclCommon/ArmComputeSubgraphUtils.hpp index 74ab789402..de3a34ee08 100644 --- a/src/backends/aclCommon/ArmComputeSubgraphUtils.hpp +++ b/src/backends/aclCommon/ArmComputeSubgraphUtils.hpp @@ -263,28 +263,13 @@ LayerType* FuseDepthwiseConvolution2dLayer(OptimizationViews& optimizationViews, ActivationDescriptor& activationDesc, std::string name) { - std::shared_ptr<ConstTensorHandle> weightHandle = baseLayer->m_Weight; - TensorInfo weightInfo = weightHandle->GetTensorInfo(); - - std::shared_ptr<ConstTensorHandle> biasHandle = baseLayer->m_Bias; - ConstTensor biasTensor; - if (!biasHandle) - { - biasTensor = ConstTensor(); - } - else - { - biasTensor = ConstTensor(biasHandle->GetTensorInfo(), biasHandle->Map(true)); - } - - IConnectableLayer* replacement = - optimizationViews.GetINetwork()-> - AddDepthwiseConvolution2dLayer(baseLayer->GetParameters(), - ConstTensor(weightInfo, weightHandle->Map(true)), - Optional<ConstTensor>(biasTensor), - name.c_str()); + IConnectableLayer* replacement = optimizationViews.GetINetwork()-> + AddDepthwiseConvolution2dLayer(baseLayer->GetParameters(), name.c_str()); LayerType* replacementLayer = PolymorphicDowncast<LayerType*>(replacement); + replacementLayer->m_Weight = std::move(baseLayer->m_Weight); + replacementLayer->m_Bias = std::move(baseLayer->m_Bias); + FuseLayer(optimizationViews, baseLayer, replacementLayer, |