From d93603325ac3f2911ee24f8a98a5a79caf29c0ca Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Tue, 30 Aug 2022 14:27:10 +0100 Subject: 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 Change-Id: Ibbc04fd18be7f938b11590bf67cd7af103cb4d99 --- shim/sl/canonical/Converter.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'shim') 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(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) -- cgit v1.2.1