commit fc598e15ff30bc375c95c9536d4a56662d867926
author Matteo Martincigh <matteo.martincigh@arm.com> Tue May 14 10:36:13 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue May 14 13:33:59 2019 +0100
tree 0d17a7928ae4faab6978552e666123bfc1926d93
parent 906f94631aa7ef590b9d8ff45507e818a0d1ac2c

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>

src/armnnTfParser/TfParser.cpp

diff --git a/src/armnnTfParser/TfParser.cpp b/src/armnnTfParser/TfParser.cpp
index e5948d5..78f4790 100755
--- a/src/armnnTfParser/TfParser.cpp
+++ b/src/armnnTfParser/TfParser.cpp
@@ -1308,7 +1308,10 @@
     CalcPadding(inputHeight, weightHeight, desc.m_StrideY, desc.m_PadTop, desc.m_PadBottom, padding);
     CalcPadding(inputWidth, weightWidth, desc.m_StrideX, desc.m_PadLeft, desc.m_PadRight, padding);
 
-    IConnectableLayer* layer = m_Network->AddConvolution2dLayer(desc, weightTensor, nodeDef.name().c_str());
+    IConnectableLayer* layer = m_Network->AddConvolution2dLayer(desc,
+                                                                weightTensor,
+                                                                EmptyOptional(),
+                                                                nodeDef.name().c_str());
     layer->GetOutputSlot(0).SetTensorInfo(outputInfo);
     inputSlot.Connect(layer->GetInputSlot(0));
 
@@ -1426,7 +1429,10 @@
     CalcPadding(inputHeight, weightHeight, desc.m_StrideY, desc.m_PadTop, desc.m_PadBottom, padding);
     CalcPadding(inputWidth, weightWidth, desc.m_StrideX, desc.m_PadLeft, desc.m_PadRight, padding);
 
-    IConnectableLayer* layer = m_Network->AddDepthwiseConvolution2dLayer(desc, weightTensor, nodeDef.name().c_str());
+    IConnectableLayer* layer = m_Network->AddDepthwiseConvolution2dLayer(desc,
+                                                                         weightTensor,
+                                                                         EmptyOptional(),
+                                                                         nodeDef.name().c_str());
     layer->GetOutputSlot(0).SetTensorInfo(outputInfo);
     inputSlot.Connect(layer->GetInputSlot(0));
 
@@ -3127,10 +3133,11 @@
     desc.m_BiasEnabled = addNodeDef != nullptr;
 
     IConnectableLayer* layer = nullptr;
+    Optional<ConstTensor> optionalBiases;
+    std::vector<float> biasTensorData;
     // Makes the layer.
     if (addNodeDef != nullptr)
     {
-        std::vector<float> biasTensorData;
         ConstTensor biases = biasNode->GetConstTensor(biasTensorData);
 
         if (weights.GetShape()[1] != biases.GetShape()[0])
@@ -3145,12 +3152,9 @@
                         % CHECK_LOCATION().AsString()));
         }
 
-        layer = m_Network->AddFullyConnectedLayer(desc, weights, biases, armnnLayerName);
+        optionalBiases = Optional<ConstTensor>(biases);
     }
-    else
-    {
-        layer = m_Network->AddFullyConnectedLayer(desc, weights, armnnLayerName);
-    }
+    layer = m_Network->AddFullyConnectedLayer(desc, weights, optionalBiases, armnnLayerName);
 
     BOOST_ASSERT(layer != nullptr);