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/armnnTfLiteParser/TfLiteParser.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/armnnTfLiteParser/TfLiteParser.cpp')
| -rw-r--r-- | src/armnnTfLiteParser/TfLiteParser.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp index 036a881d1c..11d5b5c93e 100644 --- a/src/armnnTfLiteParser/TfLiteParser.cpp +++ b/src/armnnTfLiteParser/TfLiteParser.cpp @@ -748,13 +748,14 @@ void TfLiteParser::ParseConv2D(size_t subgraphIndex, size_t operatorIndex) armnn::Optional<armnn::PermutationVector&>()); layer = m_Network->AddConvolution2dLayer(desc, filterTensorAndData.first, - biasTensorAndData.first, + Optional<ConstTensor>(biasTensorAndData.first), layerName.c_str()); } else { layer = m_Network->AddConvolution2dLayer(desc, filterTensorAndData.first, + EmptyOptional(), layerName.c_str()); } @@ -836,13 +837,14 @@ void TfLiteParser::ParseDepthwiseConv2D(size_t subgraphIndex, size_t operatorInd armnn::Optional<armnn::PermutationVector&>()); layer = m_Network->AddDepthwiseConvolution2dLayer(desc, filterTensorAndData.first, - biasTensorAndData.first, + Optional<ConstTensor>(biasTensorAndData.first), layerName.c_str()); } else { layer = m_Network->AddDepthwiseConvolution2dLayer(desc, filterTensorAndData.first, + EmptyOptional(), layerName.c_str()); } BOOST_ASSERT(layer != nullptr); @@ -1757,13 +1759,14 @@ void TfLiteParser::ParseFullyConnected(size_t subgraphIndex, size_t operatorInde armnn::Optional<armnn::PermutationVector&>()); layer = m_Network->AddFullyConnectedLayer(desc, filterTensorAndData.first, - biasTensorAndData.first, + Optional<ConstTensor>(biasTensorAndData.first), layerName.c_str()); } else { layer = m_Network->AddFullyConnectedLayer(desc, filterTensorAndData.first, + EmptyOptional(), layerName.c_str()); } BOOST_ASSERT(layer != nullptr); |