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, 8 insertions, 2 deletions

diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp
index a68a6e3f42..1193ab721e 100644
--- a/src/armnn/test/CreateWorkload.hpp
+++ b/src/armnn/test/CreateWorkload.hpp
@@ -1148,12 +1148,18 @@ std::pair<armnn::IOptimizedNetworkPtr, std::unique_ptr<PreCompiledWorkload>> Cre
         armnn::ConstTensor biases(biasTensorInfo, biasData);
 
         // Create convolution layer with biases
-        convLayer = net.AddConvolution2dLayer(convDesc2d, weights, biases, convLayerName.c_str());
+        convLayer = net.AddConvolution2dLayer(convDesc2d,
+                                              weights,
+                                              Optional<ConstTensor>(biases),
+                                              convLayerName.c_str());
     }
     else
     {
         // Create convolution layer without biases
-        convLayer = net.AddConvolution2dLayer(convDesc2d, weights, convLayerName.c_str());
+        convLayer = net.AddConvolution2dLayer(convDesc2d,
+                                              weights,
+                                              EmptyOptional(),
+                                              convLayerName.c_str());
     }
 
     BOOST_TEST(convLayer);