From 721e629fa07e65d6a53c093518021e71e48eeac2 Mon Sep 17 00:00:00 2001 From: Keith Davis Date: Tue, 17 May 2022 10:06:53 +0100 Subject: IVGCVSW-6123 ConstTensorsAsInputs: Conv2d * Use new INetwork::AddConvolution2dLayer instead of deprecated version * Remove duplicated test in SerlializerTests * Fix some cosmetics Signed-off-by: Keith Davis Change-Id: I3407815bfdc1cdc01ca0a667b8e4d80d8621783f --- src/profiling/test/ProfilingTestUtils.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/profiling') diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp index 58708cab9a..215ae343d6 100644 --- a/src/profiling/test/ProfilingTestUtils.cpp +++ b/src/profiling/test/ProfilingTestUtils.cpp @@ -424,9 +424,18 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId) conv2dDesc.m_PadTop = 2; conv2dDesc.m_PadBottom = 2; conv2dDesc.m_BiasEnabled = true; - ARMNN_NO_DEPRECATE_WARN_BEGIN - IConnectableLayer* conv2d = net->AddConvolution2dLayer(conv2dDesc, weights, optionalBiases); - ARMNN_NO_DEPRECATE_WARN_END + + IConnectableLayer* conv2d = net->AddConvolution2dLayer(conv2dDesc); + + armnn::IConnectableLayer* weightsLayer = net->AddConstantLayer(weights, "Weights"); + armnn::IConnectableLayer* biasLayer = net->AddConstantLayer(biases, "Bias"); + + weightsLayer->GetOutputSlot(0).SetTensorInfo(weightInfo); + weightsLayer->GetOutputSlot(0).Connect(conv2d->GetInputSlot(1u)); + + biasLayer->GetOutputSlot(0).SetTensorInfo(biasInfo); + biasLayer->GetOutputSlot(0).Connect(conv2d->GetInputSlot(2u)); + // Abs layer armnn::ElementwiseUnaryDescriptor absDesc; armnn::IConnectableLayer* const abs = net->AddElementwiseUnaryLayer(absDesc, "abs"); -- cgit v1.2.1