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/ImageTensorGenerator | |
| 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/ImageTensorGenerator')
| -rw-r--r-- | tests/ImageTensorGenerator/ImageTensorGenerator.cpp | 5 | ||||
| -rw-r--r-- | tests/ImageTensorGenerator/ImageTensorGenerator.hpp | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp index b4432558c4..a69a098eb4 100644 --- a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp +++ b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp @@ -9,7 +9,6 @@ #include <armnn/TypesUtils.hpp> #include <armnnUtils/Filesystem.hpp> -#include <mapbox/variant.hpp> #include <cxxopts/cxxopts.hpp> #include <algorithm> @@ -297,9 +296,7 @@ int main(int argc, char* argv[]) const unsigned int batchSize = 1; const armnn::DataLayout outputLayout(cmdline.GetLayout()); - using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<uint8_t>, - std::vector<int8_t>>; - std::vector<TContainer> imageDataContainers; + std::vector<armnn::TContainer> imageDataContainers; const NormalizationParameters& normParams = GetNormalizationParameters(modelFormat, outputType); try { diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.hpp b/tests/ImageTensorGenerator/ImageTensorGenerator.hpp index 6d2e549360..c668608f1d 100644 --- a/tests/ImageTensorGenerator/ImageTensorGenerator.hpp +++ b/tests/ImageTensorGenerator/ImageTensorGenerator.hpp @@ -5,6 +5,7 @@ #include "../InferenceTestImage.hpp" +#include <armnn/Utils.hpp> #include <armnn/TypesUtils.hpp> #include <armnnUtils/Permute.hpp> |