IVGCVSW-6359 Create a single definition of TContainer
* Added a single definition of TContainer to include/armnn/Utils.hpp
* Change all files which contained their own identical definitions of TContainer to use the new one
Signed-off-by: David Monahan <David.Monahan@arm.com>
Change-Id: I63e633693a430bbbd6a29001cafa19742ef8309a
diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp
index fa8c8c8..66be8fd 100644
--- a/tests/ExecuteNetwork/ExecuteNetwork.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp
@@ -9,6 +9,7 @@
#include <AsyncExecutionCallback.hpp>
#include <armnn/Logging.hpp>
+#include <armnn/Utils.hpp>
#include <armnnUtils/Filesystem.hpp>
#include <InferenceTest.hpp>
@@ -370,8 +371,8 @@
{
using namespace std::chrono;
- std::vector<std::vector<TContainer>> inputs;
- std::vector<std::vector<TContainer>> outputs;
+ std::vector<std::vector<armnn::TContainer>> inputs;
+ std::vector<std::vector<armnn::TContainer>> outputs;
try
{
@@ -436,7 +437,7 @@
for(unsigned int j = 0; j < params.m_Iterations ; ++j)
{
- std::vector<TContainer> inputDataContainers;
+ std::vector<armnn::TContainer> inputDataContainers;
for(unsigned int i = 0; i < numInputs; ++i)
{
// If there are less input files given than required for the execution of
@@ -460,7 +461,7 @@
numElements = params.m_InputTensorShapes[i]->GetNumElements();
}
- TContainer tensorData;
+ armnn::TContainer tensorData;
PopulateTensorWithData(tensorData,
numElements,
params.m_InputTypes[i],
@@ -476,7 +477,7 @@
for (unsigned int j = 0; j < params.m_Iterations; ++j)
{
- std::vector <TContainer> outputDataContainers;
+ std::vector <armnn::TContainer> outputDataContainers;
for (unsigned int i = 0; i < numOutputs; ++i)
{
if (params.m_OutputTypes[i].compare("float") == 0)
@@ -596,7 +597,7 @@
{
ARMNN_LOG(info) << "Asynchronous execution with Arm NN thread pool... \n";
armnn::AsyncCallbackManager callbackManager;
- std::unordered_map<armnn::InferenceId, std::vector<TContainer>&> inferenceOutputMap;
+ std::unordered_map<armnn::InferenceId, std::vector<armnn::TContainer>&> inferenceOutputMap;
// Declare the latest and earliest inference times here to be used when calculating overall time
std::chrono::high_resolution_clock::time_point earliestStartTime;