diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2019-05-01 14:44:27 +0100 |
|---|---|---|
| committer | Jim Flynn Arm <jim.flynn@arm.com> | 2019-05-02 10:23:48 +0000 |
| commit | b4d7eaef418bfda0b939c757b6206570f70aff8e (patch) | |
| tree | ebe8decb6df6091028d21336d221eb599ab9a503 /src/armnnDeserializer | |
| parent | 93e2e40500b2e0b7a47f3214a9b0499da50476b0 (diff) | |
| download | armnn-b4d7eaef418bfda0b939c757b6206570f70aff8e.tar.gz | |
IVGCVSW-3039 Unify BindingPointInfo declarations
Change-Id: I3deb2b9a37e8a8f8f2ed93c64ed0656ae911e24c
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnnDeserializer')
| -rw-r--r-- | src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp b/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp index 038cce4da2..fef2409074 100644 --- a/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp +++ b/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp @@ -203,8 +203,6 @@ void ParserFlatbuffersSerializeFixture::RunTest( const std::map<std::string, std::vector<InputDataType>>& inputData, const std::map<std::string, std::vector<OutputDataType>>& expectedOutputData) { - using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; - auto ConvertBindingInfo = [](const armnnDeserializer::BindingPointInfo& bindingInfo) { return std::make_pair(bindingInfo.m_BindingId, bindingInfo.m_TensorInfo); @@ -214,7 +212,8 @@ void ParserFlatbuffersSerializeFixture::RunTest( armnn::InputTensors inputTensors; for (auto&& it : inputData) { - BindingPointInfo bindingInfo = ConvertBindingInfo(m_Parser->GetNetworkInputBindingInfo(layersId, it.first)); + armnn::BindingPointInfo bindingInfo = ConvertBindingInfo( + m_Parser->GetNetworkInputBindingInfo(layersId, it.first)); armnn::VerifyTensorInfoDataType(bindingInfo.second, ArmnnInputType); inputTensors.push_back({ bindingInfo.first, armnn::ConstTensor(bindingInfo.second, it.second.data()) }); } @@ -224,7 +223,8 @@ void ParserFlatbuffersSerializeFixture::RunTest( armnn::OutputTensors outputTensors; for (auto&& it : expectedOutputData) { - BindingPointInfo bindingInfo = ConvertBindingInfo(m_Parser->GetNetworkOutputBindingInfo(layersId, it.first)); + armnn::BindingPointInfo bindingInfo = ConvertBindingInfo( + m_Parser->GetNetworkOutputBindingInfo(layersId, it.first)); armnn::VerifyTensorInfoDataType(bindingInfo.second, ArmnnOutputType); outputStorage.emplace(it.first, MakeTensor<OutputDataType, NumOutputDimensions>(bindingInfo.second)); outputTensors.push_back( @@ -236,7 +236,8 @@ void ParserFlatbuffersSerializeFixture::RunTest( // Compare each output tensor to the expected values for (auto&& it : expectedOutputData) { - BindingPointInfo bindingInfo = ConvertBindingInfo(m_Parser->GetNetworkOutputBindingInfo(layersId, it.first)); + armnn::BindingPointInfo bindingInfo = ConvertBindingInfo( + m_Parser->GetNetworkOutputBindingInfo(layersId, it.first)); auto outputExpected = MakeTensor<OutputDataType, NumOutputDimensions>(bindingInfo.second, it.second); BOOST_TEST(CompareTensors(outputExpected, outputStorage[it.first])); } |