From b4d7eaef418bfda0b939c757b6206570f70aff8e Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Wed, 1 May 2019 14:44:27 +0100 Subject: IVGCVSW-3039 Unify BindingPointInfo declarations Change-Id: I3deb2b9a37e8a8f8f2ed93c64ed0656ae911e24c Signed-off-by: Jim Flynn --- tests/InferenceModel.hpp | 44 ++++++++++------------ .../MultipleNetworksCifar10.cpp | 5 +-- 2 files changed, 21 insertions(+), 28 deletions(-) (limited to 'tests') diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp index fa71b3035e..d2d2ca3c8e 100644 --- a/tests/InferenceModel.hpp +++ b/tests/InferenceModel.hpp @@ -74,9 +74,7 @@ inline bool CheckRequestedBackendsAreValid(const std::vector& namespace InferenceModelInternal { -// This needs to go when the armnnCaffeParser, armnnTfParser and armnnTfLiteParser -// definitions of BindingPointInfo gets consolidated. -using BindingPointInfo = std::pair; +using BindingPointInfo = armnn::BindingPointInfo; using QuantizationParams = std::pair; @@ -108,11 +106,10 @@ struct CreateNetworkImpl { public: using Params = InferenceModelInternal::Params; - using BindingPointInfo = InferenceModelInternal::BindingPointInfo; static armnn::INetworkPtr Create(const Params& params, - std::vector& inputBindings, - std::vector& outputBindings) + std::vector& inputBindings, + std::vector& outputBindings) { const std::string& modelPath = params.m_ModelPath; @@ -169,11 +166,10 @@ struct CreateNetworkImpl public: using IParser = armnnDeserializer::IDeserializer; using Params = InferenceModelInternal::Params; - using BindingPointInfo = InferenceModelInternal::BindingPointInfo; static armnn::INetworkPtr Create(const Params& params, - std::vector& inputBindings, - std::vector& outputBindings) + std::vector& inputBindings, + std::vector& outputBindings) { auto parser(IParser::Create()); BOOST_ASSERT(parser); @@ -226,11 +222,10 @@ struct CreateNetworkImpl public: using IParser = armnnTfLiteParser::ITfLiteParser; using Params = InferenceModelInternal::Params; - using BindingPointInfo = InferenceModelInternal::BindingPointInfo; static armnn::INetworkPtr Create(const Params& params, - std::vector& inputBindings, - std::vector& outputBindings) + std::vector& inputBindings, + std::vector& outputBindings) { const std::string& modelPath = params.m_ModelPath; @@ -246,14 +241,14 @@ public: for (const std::string& inputLayerName : params.m_InputBindings) { - BindingPointInfo inputBinding = + armnn::BindingPointInfo inputBinding = parser->GetNetworkInputBindingInfo(params.m_SubgraphId, inputLayerName); inputBindings.push_back(inputBinding); } for (const std::string& outputLayerName : params.m_OutputBindings) { - BindingPointInfo outputBinding = + armnn::BindingPointInfo outputBinding = parser->GetNetworkOutputBindingInfo(params.m_SubgraphId, outputLayerName); outputBindings.push_back(outputBinding); } @@ -309,7 +304,7 @@ public: template inline armnn::InputTensors MakeInputTensors( - const std::vector& inputBindings, + const std::vector& inputBindings, const std::vector& inputDataContainers) { armnn::InputTensors inputTensors; @@ -323,7 +318,7 @@ inline armnn::InputTensors MakeInputTensors( for (size_t i = 0; i < numInputs; i++) { - const InferenceModelInternal::BindingPointInfo& inputBinding = inputBindings[i]; + const armnn::BindingPointInfo& inputBinding = inputBindings[i]; const TContainer& inputData = inputDataContainers[i]; boost::apply_visitor([&](auto&& value) @@ -344,7 +339,7 @@ inline armnn::InputTensors MakeInputTensors( template inline armnn::OutputTensors MakeOutputTensors( - const std::vector& outputBindings, + const std::vector& outputBindings, std::vector& outputDataContainers) { armnn::OutputTensors outputTensors; @@ -358,7 +353,7 @@ inline armnn::OutputTensors MakeOutputTensors( for (size_t i = 0; i < numOutputs; i++) { - const InferenceModelInternal::BindingPointInfo& outputBinding = outputBindings[i]; + const armnn::BindingPointInfo& outputBinding = outputBindings[i]; TContainer& outputData = outputDataContainers[i]; boost::apply_visitor([&](auto&& value) @@ -383,7 +378,6 @@ class InferenceModel public: using DataType = TDataType; using Params = InferenceModelInternal::Params; - using BindingPointInfo = InferenceModelInternal::BindingPointInfo; using QuantizationParams = InferenceModelInternal::QuantizationParams; using TContainer = boost::variant, std::vector, std::vector>; @@ -564,24 +558,24 @@ public: } } - const BindingPointInfo& GetInputBindingInfo(unsigned int inputIndex = 0u) const + const armnn::BindingPointInfo& GetInputBindingInfo(unsigned int inputIndex = 0u) const { CheckInputIndexIsValid(inputIndex); return m_InputBindings[inputIndex]; } - const std::vector& GetInputBindingInfos() const + const std::vector& GetInputBindingInfos() const { return m_InputBindings; } - const BindingPointInfo& GetOutputBindingInfo(unsigned int outputIndex = 0u) const + const armnn::BindingPointInfo& GetOutputBindingInfo(unsigned int outputIndex = 0u) const { CheckOutputIndexIsValid(outputIndex); return m_OutputBindings[outputIndex]; } - const std::vector& GetOutputBindingInfos() const + const std::vector& GetOutputBindingInfos() const { return m_OutputBindings; } @@ -614,8 +608,8 @@ private: armnn::NetworkId m_NetworkIdentifier; std::shared_ptr m_Runtime; - std::vector m_InputBindings; - std::vector m_OutputBindings; + std::vector m_InputBindings; + std::vector m_OutputBindings; bool m_EnableProfiling; template diff --git a/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp b/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp index 2bbfb69c8d..006318f73a 100644 --- a/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp +++ b/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp @@ -186,9 +186,8 @@ int main(int argc, char* argv[]) for (unsigned int k = 0; k < networksCount; ++k) { - using BindingPointInfo = InferenceModelInternal::BindingPointInfo; - std::vector inputBindings = { networks[k].m_InputBindingInfo }; - std::vector outputBindings = { networks[k].m_OutputBindingInfo }; + std::vector inputBindings = { networks[k].m_InputBindingInfo }; + std::vector outputBindings = { networks[k].m_OutputBindingInfo }; std::vector inputDataContainers = { testCaseData->m_InputImage }; std::vector outputDataContainers = { outputs[k] }; -- cgit v1.2.1