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/InferenceTest.inl | |
| 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/InferenceTest.inl')
| -rw-r--r-- | tests/InferenceTest.inl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/InferenceTest.inl b/tests/InferenceTest.inl index 79700d991b..91a90f3820 100644 --- a/tests/InferenceTest.inl +++ b/tests/InferenceTest.inl @@ -4,6 +4,7 @@ // #include "InferenceTest.hpp" +#include <armnn/Utils.hpp> #include <armnn/utility/Assert.hpp> #include <armnn/utility/NumericCast.hpp> #include "CxxoptsUtils.hpp" @@ -26,9 +27,6 @@ namespace armnn namespace test { -using TContainer = - mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>, std::vector<int8_t>>; - template <typename TTestCaseDatabase, typename TModel> ClassifierTestCase<TTestCaseDatabase, TModel>::ClassifierTestCase( int& numInferencesRef, @@ -40,7 +38,7 @@ ClassifierTestCase<TTestCaseDatabase, TModel>::ClassifierTestCase( unsigned int label, std::vector<typename TModel::DataType> modelInput) : InferenceModelTestCase<TModel>( - model, testCaseId, std::vector<TContainer>{ modelInput }, { model.GetOutputSize() }) + model, testCaseId, std::vector<armnn::TContainer>{ modelInput }, { model.GetOutputSize() }) , m_Label(label) , m_QuantizationParams(model.GetQuantizationParams()) , m_NumInferencesRef(numInferencesRef) |