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/InferenceModel.hpp | |
| 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/InferenceModel.hpp')
| -rw-r--r-- | tests/InferenceModel.hpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp index cf3aae137e..e2cd5d9868 100644 --- a/tests/InferenceModel.hpp +++ b/tests/InferenceModel.hpp @@ -5,7 +5,9 @@ #pragma once + #include <armnn/ArmNN.hpp> +#include <armnn/Utils.hpp> #include <armnn/Threadpool.hpp> #include <armnn/Logging.hpp> #include <armnn/utility/Timer.hpp> @@ -371,8 +373,7 @@ public: using DataType = TDataType; using Params = InferenceModelInternal::Params; using QuantizationParams = InferenceModelInternal::QuantizationParams; - using TContainer - = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>, std::vector<int8_t>>; + struct CommandLineOptions { @@ -583,8 +584,8 @@ public: } std::chrono::duration<double, std::milli> Run( - const std::vector<TContainer>& inputContainers, - std::vector<TContainer>& outputContainers) + const std::vector<armnn::TContainer>& inputContainers, + std::vector<armnn::TContainer>& outputContainers) { for (unsigned int i = 0; i < outputContainers.size(); ++i) { @@ -632,8 +633,8 @@ public: std::tuple<unsigned int, std::chrono::duration<double, std::milli>> RunAsync( armnn::experimental::IWorkingMemHandle& workingMemHandleRef, - const std::vector<TContainer>& inputContainers, - std::vector<TContainer>& outputContainers, + const std::vector<armnn::TContainer>& inputContainers, + std::vector<armnn::TContainer>& outputContainers, unsigned int inferenceID) { for (unsigned int i = 0; i < outputContainers.size(); ++i) @@ -683,8 +684,8 @@ public: } } - void RunAsync(const std::vector<TContainer>& inputContainers, - std::vector<TContainer>& outputContainers, + void RunAsync(const std::vector<armnn::TContainer>& inputContainers, + std::vector<armnn::TContainer>& outputContainers, std::shared_ptr<armnn::IAsyncExecutionCallback> cb) { for (unsigned int i = 0; i < outputContainers.size(); ++i) |