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/armnnTfLiteParser/test | |
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/armnnTfLiteParser/test')
-rw-r--r-- | src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp index 69c5ec1767..fdd8b82f85 100644 --- a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp +++ b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp @@ -255,13 +255,11 @@ void ParserFlatbuffersFixture::RunTest(size_t subgraphId, const std::map<std::string, std::vector<DataType1>>& inputData, const std::map<std::string, std::vector<DataType2>>& expectedOutputData) { - using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; - // Setup the armnn input tensors from the given vectors. armnn::InputTensors inputTensors; for (auto&& it : inputData) { - BindingPointInfo bindingInfo = m_Parser->GetNetworkInputBindingInfo(subgraphId, it.first); + armnn::BindingPointInfo bindingInfo = m_Parser->GetNetworkInputBindingInfo(subgraphId, it.first); armnn::VerifyTensorInfoDataType(bindingInfo.second, armnnType1); inputTensors.push_back({ bindingInfo.first, armnn::ConstTensor(bindingInfo.second, it.second.data()) }); } @@ -293,7 +291,7 @@ void ParserFlatbuffersFixture::RunTest(size_t subgraphId, // Compare each output tensor to the expected values for (auto&& it : expectedOutputData) { - BindingPointInfo bindingInfo = m_Parser->GetNetworkOutputBindingInfo(subgraphId, it.first); + armnn::BindingPointInfo bindingInfo = m_Parser->GetNetworkOutputBindingInfo(subgraphId, it.first); auto outputExpected = MakeTensor<DataType2, NumOutputDimensions>(bindingInfo.second, it.second); BOOST_TEST(CompareTensors(outputExpected, outputStorage[it.first])); } @@ -311,13 +309,11 @@ void ParserFlatbuffersFixture::RunTest(std::size_t subgraphId, const std::map<std::string, std::vector<DataType1>>& inputData, const std::map<std::string, std::vector<DataType2>>& expectedOutputData) { - using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; - // Setup the armnn input tensors from the given vectors. armnn::InputTensors inputTensors; for (auto&& it : inputData) { - BindingPointInfo bindingInfo = m_Parser->GetNetworkInputBindingInfo(subgraphId, it.first); + armnn::BindingPointInfo bindingInfo = m_Parser->GetNetworkInputBindingInfo(subgraphId, it.first); armnn::VerifyTensorInfoDataType(bindingInfo.second, armnnType1); inputTensors.push_back({ bindingInfo.first, armnn::ConstTensor(bindingInfo.second, it.second.data()) }); @@ -328,7 +324,7 @@ void ParserFlatbuffersFixture::RunTest(std::size_t subgraphId, std::map<std::string, std::vector<DataType2>> outputStorage; for (auto&& it : expectedOutputData) { - BindingPointInfo bindingInfo = m_Parser->GetNetworkOutputBindingInfo(subgraphId, it.first); + armnn::BindingPointInfo bindingInfo = m_Parser->GetNetworkOutputBindingInfo(subgraphId, it.first); armnn::VerifyTensorInfoDataType(bindingInfo.second, armnnType2); std::vector<DataType2> out(it.second.size()); |