diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-08-30 14:27:10 +0100 |
|---|---|---|
| committer | Nikhil Raj <nikhil.raj@arm.com> | 2022-09-06 11:30:05 +0100 |
| commit | d93603325ac3f2911ee24f8a98a5a79caf29c0ca (patch) | |
| tree | 45c6d685659148ea874a71d073c5ca666e333dfa /shim | |
| parent | 06875f4eb0ee3ece2afbeac9d66d45d5f139db51 (diff) | |
| download | armnn-d93603325ac3f2911ee24f8a98a5a79caf29c0ca.tar.gz | |
IVGCVSW-7006 Remove deprecated code due to be removed in 22.08
* AddConv and AddDWConv with weights and bias
* ResizeBilinearDescriptor
* b,blacklist option in accuracy tool
!android-nn-driver:8172
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ibbc04fd18be7f938b11590bf67cd7af103cb4d99
Diffstat (limited to 'shim')
| -rw-r--r-- | shim/sl/canonical/Converter.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/shim/sl/canonical/Converter.cpp b/shim/sl/canonical/Converter.cpp index b50b0a9397..5d52b4a779 100644 --- a/shim/sl/canonical/Converter.cpp +++ b/shim/sl/canonical/Converter.cpp @@ -2233,16 +2233,22 @@ bool Converter::ConvertGroupedConv2d(const Operation& operation, const Model& mo { 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) { return Fail("%s: AddConvolution2dLayer failed", __func__); } 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) |