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/armnnUtils | |
| 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/armnnUtils')
| -rw-r--r-- | src/armnnUtils/ParserPrototxtFixture.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/armnnUtils/ParserPrototxtFixture.hpp b/src/armnnUtils/ParserPrototxtFixture.hpp index 7ae0742b8e..6af989e46f 100644 --- a/src/armnnUtils/ParserPrototxtFixture.hpp +++ b/src/armnnUtils/ParserPrototxtFixture.hpp @@ -187,13 +187,11 @@ template <std::size_t NumOutputDimensions, typename T> void ParserPrototxtFixture<TParser>::RunTest(const std::map<std::string, std::vector<float>>& inputData, const std::map<std::string, std::vector<T>>& expectedOutputData) { - using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; - // Sets up the armnn input tensors from the given vectors. armnn::InputTensors inputTensors; for (auto&& it : inputData) { - BindingPointInfo bindingInfo = m_Parser->GetNetworkInputBindingInfo(it.first); + armnn::BindingPointInfo bindingInfo = m_Parser->GetNetworkInputBindingInfo(it.first); inputTensors.push_back({ bindingInfo.first, armnn::ConstTensor(bindingInfo.second, it.second.data()) }); } @@ -202,7 +200,7 @@ void ParserPrototxtFixture<TParser>::RunTest(const std::map<std::string, std::ve armnn::OutputTensors outputTensors; for (auto&& it : expectedOutputData) { - BindingPointInfo bindingInfo = m_Parser->GetNetworkOutputBindingInfo(it.first); + armnn::BindingPointInfo bindingInfo = m_Parser->GetNetworkOutputBindingInfo(it.first); outputStorage.emplace(it.first, MakeTensor<T, NumOutputDimensions>(bindingInfo.second)); outputTensors.push_back( { bindingInfo.first, armnn::Tensor(bindingInfo.second, outputStorage.at(it.first).data()) }); @@ -213,7 +211,7 @@ void ParserPrototxtFixture<TParser>::RunTest(const std::map<std::string, std::ve // Compares each output tensor to the expected values. for (auto&& it : expectedOutputData) { - BindingPointInfo bindingInfo = m_Parser->GetNetworkOutputBindingInfo(it.first); + armnn::BindingPointInfo bindingInfo = m_Parser->GetNetworkOutputBindingInfo(it.first); if (bindingInfo.second.GetNumElements() != it.second.size()) { throw armnn::Exception( |