diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-14 10:36:13 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-14 13:33:59 +0100 |
| commit | fc598e15ff30bc375c95c9536d4a56662d867926 (patch) | |
| tree | 0d17a7928ae4faab6978552e666123bfc1926d93 /src/armnnOnnxParser/OnnxParser.cpp | |
| parent | 906f94631aa7ef590b9d8ff45507e818a0d1ac2c (diff) | |
| download | armnn-fc598e15ff30bc375c95c9536d4a56662d867926.tar.gz | |
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>
Diffstat (limited to 'src/armnnOnnxParser/OnnxParser.cpp')
| -rw-r--r-- | src/armnnOnnxParser/OnnxParser.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/armnnOnnxParser/OnnxParser.cpp b/src/armnnOnnxParser/OnnxParser.cpp index a62383b563..2b4ce7d853 100644 --- a/src/armnnOnnxParser/OnnxParser.cpp +++ b/src/armnnOnnxParser/OnnxParser.cpp @@ -809,7 +809,7 @@ void OnnxParser::AddFullyConnected(const onnx::NodeProto& matmulNode, const onnx } layer = m_Network->AddFullyConnectedLayer(desc, CreateConstTensor(weightName).first, - CreateConstTensor(biasName).first, + Optional<ConstTensor>(CreateConstTensor(biasName).first), matmulNode.name().c_str()); BOOST_ASSERT(layer != nullptr); @@ -824,7 +824,10 @@ void OnnxParser::AddFullyConnected(const onnx::NodeProto& matmulNode, const onnx } else { - layer = m_Network->AddFullyConnectedLayer(desc, CreateConstTensor(weightName).first, matmulNode.name().c_str()); + layer = m_Network->AddFullyConnectedLayer(desc, + CreateConstTensor(weightName).first, + EmptyOptional(), + matmulNode.name().c_str()); BOOST_ASSERT(layer != nullptr); auto outputInfo = ComputeOutputInfo({matmulNode.output(0)}, layer, @@ -1120,13 +1123,14 @@ void OnnxParser::AddConvLayerWithDepthwiseConv(const onnx::NodeProto& node, cons auto biasTensor = CreateConstTensor(node.input(2)); layer = m_Network->AddDepthwiseConvolution2dLayer(desc, weightTensor.first, - biasTensor.first, + Optional<ConstTensor>(biasTensor.first), node.name().c_str()); } else { layer = m_Network->AddDepthwiseConvolution2dLayer(desc, weightTensor.first, + EmptyOptional(), node.name().c_str()); } BOOST_ASSERT(layer != nullptr); @@ -1319,13 +1323,14 @@ void OnnxParser::ParseConv(const onnx::NodeProto& node) auto biasTensor = CreateConstTensor(node.input(2)); layer = m_Network->AddConvolution2dLayer(desc, weightTensor.first, - biasTensor.first, + Optional<ConstTensor>(biasTensor.first), node.name().c_str()); } else { layer = m_Network->AddConvolution2dLayer(desc, weightTensor.first, + EmptyOptional(), node.name().c_str()); } BOOST_ASSERT(layer != nullptr); |