diff options
author | David Monahan <David.Monahan@arm.com> | 2021-10-22 12:57:28 +0100 |
---|---|---|
committer | David Monahan <david.monahan@arm.com> | 2021-10-22 13:53:18 +0000 |
commit | 6bb47a720ad33d0a330228b52e320a1022e4dfe2 (patch) | |
tree | 606434ca03951a79c828fb6371deb4e62fdcd858 /tests/ModelAccuracyTool-Armnn | |
parent | 81ec994a3ebc8ad02c4a622846cf64b70e1182bd (diff) | |
download | armnn-6bb47a720ad33d0a330228b52e320a1022e4dfe2.tar.gz |
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
Diffstat (limited to 'tests/ModelAccuracyTool-Armnn')
-rw-r--r-- | tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp index 10d6e6a0f8..d1d31f48a1 100644 --- a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp +++ b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp @@ -7,7 +7,9 @@ #include "../InferenceTest.hpp" #include "ModelAccuracyChecker.hpp" #include "armnnDeserializer/IDeserializer.hpp" + #include <armnnUtils/Filesystem.hpp> +#include <armnn/Utils.hpp> #include <cxxopts/cxxopts.hpp> #include <map> @@ -253,7 +255,6 @@ int main(int argc, char* argv[]) const map<std::string, std::string> imageNameToLabel = LoadValidationImageFilenamesAndLabels( validationLabelPath, pathToDataDir.string(), imageBegIndex, imageEndIndex, blacklistPath); armnnUtils::ModelAccuracyChecker checker(imageNameToLabel, modelOutputLabels); - using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<uint8_t>>; if (ValidateDirectory(dataDir)) { @@ -324,8 +325,8 @@ int main(int argc, char* argv[]) const std::string imageName = imageEntry.first; std::cout << "Processing image: " << imageName << "\n"; - vector<TContainer> inputDataContainers; - vector<TContainer> outputDataContainers; + vector<armnn::TContainer> inputDataContainers; + vector<armnn::TContainer> outputDataContainers; auto imagePath = pathToDataDir / fs::path(imageName); switch (inputTensorDataType) @@ -369,7 +370,7 @@ int main(int argc, char* argv[]) ARMNN_LOG(fatal) << "armnn::IRuntime: Failed to enqueue workload for image: " << imageName; } - checker.AddImageResult<TContainer>(imageName, outputDataContainers); + checker.AddImageResult<armnn::TContainer>(imageName, outputDataContainers); } } else |