Use the new deprecation API

 * Used the new ARMNN_DEPRECATED_MSG macro instead of @deprecated
 * Refactored the code to no longer use the deprecated methods where
   applicable

!android-nn-driver:1126

Change-Id: Ib0578d3d6fc5a763f5fb922f67ba91fafc7796f6
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>

1 files changed, 12 insertions, 18 deletions

diff --git a/src/armnn/test/QuantizerTest.cpp b/src/armnn/test/QuantizerTest.cpp
index 4f22317651..f2c739d274 100644
--- a/src/armnn/test/QuantizerTest.cpp
+++ b/src/armnn/test/QuantizerTest.cpp
@@ -686,16 +686,14 @@ INetworkPtr CreateNetworkWithFullyConnectedLayer(const bool biasEnabled,
     // Add the layers
     IConnectableLayer* input0 = network->AddInputLayer(0);
     IConnectableLayer* fullyConnected;
+    Optional<ConstTensor> optionalBias;
+    std::vector<float> biasData{10.0f, 20.0f, 30.0f};
     if (desc.m_BiasEnabled)
     {
-        std::vector<float> biasData{10.0f, 20.0f, 30.0f};
         ConstTensor bias(info, biasData);
-        fullyConnected = network->AddFullyConnectedLayer(desc, weights, bias);
-    }
-    else
-    {
-        fullyConnected = network->AddFullyConnectedLayer(desc, weights);
+        optionalBias = Optional<ConstTensor>(bias);
     }
+    fullyConnected = network->AddFullyConnectedLayer(desc, weights, optionalBias);
     IConnectableLayer* output = network->AddOutputLayer(1);
 
     // Establish connections
@@ -814,16 +812,14 @@ void TestQuantizeConvolution2d(bool useBiases)
     // Add the layers
     IConnectableLayer* input0 = network->AddInputLayer(0);
     IConnectableLayer* conv2d;
+    Optional<ConstTensor> optionalBiases;
+    std::vector<float> biasesData{-1.0f, 1.5f, 2.0f};
     if (useBiases)
     {
-        std::vector<float> biasesData{-1.0f, 1.5f, 2.0f};
         ConstTensor biases(info, biasesData);
-        conv2d = network->AddConvolution2dLayer(descriptor, weights, biases);
-    }
-    else
-    {
-        conv2d = network->AddConvolution2dLayer(descriptor, weights);
+        optionalBiases = Optional<ConstTensor>(biases);
     }
+    conv2d = network->AddConvolution2dLayer(descriptor, weights, optionalBiases);
     IConnectableLayer* output = network->AddOutputLayer(1);
 
     // Establish connections
@@ -902,16 +898,14 @@ void TestQuantizeDepthwiseConvolution2d(bool useBiases)
     // Add the layers
     IConnectableLayer* input0 = network->AddInputLayer(0);
     IConnectableLayer* depthwiseConv2d;
+    Optional<ConstTensor> optionalBiases;
+    std::vector<float> biasesData{-1.0f, 1.5f, 2.0f};
     if (useBiases)
     {
-        std::vector<float> biasesData{-1.0f, 1.5f, 2.0f};
         ConstTensor biases(info, biasesData);
-        depthwiseConv2d = network->AddDepthwiseConvolution2dLayer(descriptor, weights, biases);
-    }
-    else
-    {
-        depthwiseConv2d = network->AddDepthwiseConvolution2dLayer(descriptor, weights);
+        optionalBiases = Optional<ConstTensor>(biases);
     }
+    depthwiseConv2d = network->AddDepthwiseConvolution2dLayer(descriptor, weights, optionalBiases);
     IConnectableLayer* output = network->AddOutputLayer(1);
 
     // Establish connections