diff options
author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-08-30 14:27:10 +0100 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2022-09-06 10:21:44 +0000 |
commit | d1628bffe27db398ff5c67c2e20f89e729f8bc31 (patch) | |
tree | 80e5a72505f98689d941cdf4c7bdef0db00d255d /src/armnnSerializer | |
parent | 48f9d5db00a245d08317130b10171337df0c1142 (diff) | |
download | armnn-d1628bffe27db398ff5c67c2e20f89e729f8bc31.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 'src/armnnSerializer')
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index a568bf15c9..3573a8195c 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -436,19 +436,19 @@ TEST_CASE("SerializeConvolution2d") armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); - ARMNN_NO_DEPRECATE_WARN_BEGIN - armnn::IConnectableLayer* const convLayer = - network->AddConvolution2dLayer(descriptor, - weights, - armnn::Optional<armnn::ConstTensor>(biases), - layerName.c_str()); - ARMNN_NO_DEPRECATE_WARN_END + armnn::IConnectableLayer* const weightsLayer = network->AddConstantLayer(weights, "weights"); + armnn::IConnectableLayer* const biasLayer = network->AddConstantLayer(biases, "bias"); + armnn::IConnectableLayer* const convLayer = network->AddConvolution2dLayer(descriptor, layerName.c_str()); armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); inputLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(0)); + weightsLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(1)); + biasLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(2)); convLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); inputLayer->GetOutputSlot(0).SetTensorInfo(inputInfo); + weightsLayer->GetOutputSlot(0).SetTensorInfo(weightsInfo); + biasLayer->GetOutputSlot(0).SetTensorInfo(biasesInfo); convLayer->GetOutputSlot(0).SetTensorInfo(outputInfo); armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); @@ -458,7 +458,7 @@ TEST_CASE("SerializeConvolution2d") deserializedNetwork->ExecuteStrategy(verifier); } -TEST_CASE("SerializeConvolution2dWithPerAxisParamsTestDeprecatedMethod") +TEST_CASE("SerializeConvolution2dWithPerAxisParams") { using namespace armnn; @@ -491,19 +491,19 @@ TEST_CASE("SerializeConvolution2dWithPerAxisParamsTestDeprecatedMethod") armnn::INetworkPtr network = armnn::INetwork::Create(); armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); - ARMNN_NO_DEPRECATE_WARN_BEGIN - armnn::IConnectableLayer* const convLayer = - network->AddConvolution2dLayer(descriptor, - weights, - armnn::Optional<armnn::ConstTensor>(biases), - layerName.c_str()); - ARMNN_NO_DEPRECATE_WARN_END + armnn::IConnectableLayer* const weightsLayer = network->AddConstantLayer(weights, "weights"); + armnn::IConnectableLayer* const biasLayer = network->AddConstantLayer(weights, "bias"); + armnn::IConnectableLayer* const convLayer = network->AddConvolution2dLayer(descriptor, layerName.c_str()); armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); inputLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(0)); + weightsLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(1)); + biasLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(2)); convLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); inputLayer->GetOutputSlot(0).SetTensorInfo(inputInfo); + weightsLayer->GetOutputSlot(0).SetTensorInfo(kernelInfo); + biasLayer->GetOutputSlot(0).SetTensorInfo(biasInfo); convLayer->GetOutputSlot(0).SetTensorInfo(outputInfo); armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); |