diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2021-10-28 11:11:35 +0100 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2021-10-28 10:36:25 +0000 |
| commit | 40d2741b459fb7d55ff034d615678848a8e0af7c (patch) | |
| tree | e0d89fcf02a2a6c2a0a6b8121105c1371cf57193 /include | |
| parent | 040719d09b696dcb979b4dcadfc32181cb84301a (diff) | |
| download | armnn-40d2741b459fb7d55ff034d615678848a8e0af7c.tar.gz | |
IVGCVSW-6513: Compilation failure in armnn-mobilenet-quant in ML-Examples
* Move TContainer to armnnUtils library
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I3c0f895d11b66f6ee224ac689a19d0477f990b98
Diffstat (limited to 'include')
| -rw-r--r-- | include/armnn/Utils.hpp | 8 | ||||
| -rw-r--r-- | include/armnnUtils/TContainer.hpp | 20 |
2 files changed, 21 insertions, 7 deletions
diff --git a/include/armnn/Utils.hpp b/include/armnn/Utils.hpp index 533117c5d9..7d442ba4b5 100644 --- a/include/armnn/Utils.hpp +++ b/include/armnn/Utils.hpp @@ -4,9 +4,8 @@ // #pragma once -#include "armnn/TypesUtils.hpp" +#include <armnn/TypesUtils.hpp> -#include <mapbox/variant.hpp> #include <iostream> namespace armnn @@ -42,9 +41,4 @@ bool NeonDetected(); const std::string GetVersion(); -// Standard definition of TContainer used by ArmNN, use this definition or add alternative definitions here instead of -// defining your own. -using TContainer = - mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>, std::vector<int8_t>>; - } // namespace armnn diff --git a/include/armnnUtils/TContainer.hpp b/include/armnnUtils/TContainer.hpp new file mode 100644 index 0000000000..a55f9df488 --- /dev/null +++ b/include/armnnUtils/TContainer.hpp @@ -0,0 +1,20 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <armnn/TypesUtils.hpp> + +#include <mapbox/variant.hpp> + +namespace armnnUtils +{ + +// Standard definition of TContainer used by ArmNN, use this definition or add alternative definitions here instead of +// defining your own. + using TContainer = + mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>, std::vector<int8_t>>; + +} // namespace armnnUtils |