diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-08-30 15:55:28 +0100 |
|---|---|---|
| committer | Nikhil Raj <nikhil.raj@arm.com> | 2022-09-06 11:43:43 +0100 |
| commit | f8696267c63348d1cd08c6c5fef1abad937da221 (patch) | |
| tree | 27a9824d5900d00c3ed500ac3196d0797eebf603 | |
| parent | b86b7ebfc92f693a5d7a5e3d5b283463b7e31e9f (diff) | |
| download | android-nn-driver-f8696267c63348d1cd08c6c5fef1abad937da221.tar.gz | |
IVGCVSW-7006 Remove deprecated code due to be removed in 22.08
* AddConv with weights and bias
!armnn:8167
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I9b2ad21482d503161721b7d4eee5c5d16b59a379
| -rw-r--r-- | ConversionUtils_1_2.hpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ConversionUtils_1_2.hpp b/ConversionUtils_1_2.hpp index 171d61bd..ae24230c 100644 --- a/ConversionUtils_1_2.hpp +++ b/ConversionUtils_1_2.hpp @@ -1233,10 +1233,9 @@ bool ConvertGroupedConv2d(const HalOperation& operation, const HalModel& model, return false; } - ARMNN_NO_DEPRECATE_WARN_BEGIN - IConnectableLayer* convLayer = - data.m_Network->AddConvolution2dLayer(desc, groupWeights, Optional<ConstTensor>(groupBiases)); - ARMNN_NO_DEPRECATE_WARN_END + IConnectableLayer* weightsLayer = data.m_Network->AddConstantLayer(groupWeights); + IConnectableLayer* biasLayer = data.m_Network->AddConstantLayer(groupBiases); + IConnectableLayer* convLayer = data.m_Network->AddConvolution2dLayer(desc); if (!convLayer) { @@ -1244,6 +1243,11 @@ bool ConvertGroupedConv2d(const HalOperation& operation, const HalModel& model, } splitterLayer->GetOutputSlot(group).Connect(convLayer->GetInputSlot(0)); + weightsLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(1)); + biasLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(2)); + + weightsLayer->GetOutputSlot(0).SetTensorInfo(groupWeightsInfo); + biasLayer->GetOutputSlot(0).SetTensorInfo(groupBiasesInfo); convLayer->GetOutputSlot(0).SetTensorInfo(groupOutputInfo); if(isDynamic) |