commit d93603325ac3f2911ee24f8a98a5a79caf29c0ca
author Teresa Charlin <teresa.charlinreyes@arm.com> Tue Aug 30 14:27:10 2022 +0100
committer Nikhil Raj <nikhil.raj@arm.com> Tue Sep 06 11:30:05 2022 +0100
tree 45c6d685659148ea874a71d073c5ca666e333dfa
parent 06875f4eb0ee3ece2afbeac9d66d45d5f139db51

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

src/armnn/test/GraphTests.cpp

diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp
index 95421c5..eea7ae8 100644
--- a/src/armnn/test/GraphTests.cpp
+++ b/src/armnn/test/GraphTests.cpp
@@ -632,13 +632,13 @@
     TensorInfo weightsInfo = constInfo;
     ConstTensor weights(weightsInfo, weightData);
     DepthwiseConvolution2dDescriptor desc;
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
-    // GetConstantTensorsByRef() returns {m_Weights, m_Bias} so we need to use the old AddDepthwiseConvolution2dLayer()
-    const auto depthwiseLayer = net->AddDepthwiseConvolution2dLayer(desc, weights, EmptyOptional(), "Depthwise");
-    ARMNN_NO_DEPRECATE_WARN_END
-    const void* resultData = depthwiseLayer->GetConstantTensorsByRef()[0].get()->GetConstTensor<void>();
-    auto resultValue = reinterpret_cast<const uint8_t*>(resultData);
-    CHECK(resultValue[0] == 3);
+
+    const auto weightsLayer = net->AddConstantLayer(weights);
+
+    const void* resultDataWeights = weightsLayer->GetConstantTensorsByRef()[0].get()->GetConstTensor<void>();
+    auto resultValueWeights = reinterpret_cast<const uint8_t*>(resultDataWeights);
+    CHECK(resultValueWeights[0] == 3);
+
 }
 
 }