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 /tests/InferenceModel.hpp | |
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 'tests/InferenceModel.hpp')
-rw-r--r-- | tests/InferenceModel.hpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp index e2cd5d9868..13f7d74e8d 100644 --- a/tests/InferenceModel.hpp +++ b/tests/InferenceModel.hpp @@ -7,13 +7,15 @@ #include <armnn/ArmNN.hpp> -#include <armnn/Utils.hpp> #include <armnn/Threadpool.hpp> #include <armnn/Logging.hpp> #include <armnn/utility/Timer.hpp> #include <armnn/BackendRegistry.hpp> #include <armnn/utility/Assert.hpp> #include <armnn/utility/NumericCast.hpp> + +#include <armnnUtils/TContainer.hpp> + #include <common/include/ProfilingGuid.hpp> #if defined(ARMNN_SERIALIZER) @@ -584,8 +586,8 @@ public: } std::chrono::duration<double, std::milli> Run( - const std::vector<armnn::TContainer>& inputContainers, - std::vector<armnn::TContainer>& outputContainers) + const std::vector<armnnUtils::TContainer>& inputContainers, + std::vector<armnnUtils::TContainer>& outputContainers) { for (unsigned int i = 0; i < outputContainers.size(); ++i) { @@ -633,8 +635,8 @@ public: std::tuple<unsigned int, std::chrono::duration<double, std::milli>> RunAsync( armnn::experimental::IWorkingMemHandle& workingMemHandleRef, - const std::vector<armnn::TContainer>& inputContainers, - std::vector<armnn::TContainer>& outputContainers, + const std::vector<armnnUtils::TContainer>& inputContainers, + std::vector<armnnUtils::TContainer>& outputContainers, unsigned int inferenceID) { for (unsigned int i = 0; i < outputContainers.size(); ++i) @@ -684,8 +686,8 @@ public: } } - void RunAsync(const std::vector<armnn::TContainer>& inputContainers, - std::vector<armnn::TContainer>& outputContainers, + void RunAsync(const std::vector<armnnUtils::TContainer>& inputContainers, + std::vector<armnnUtils::TContainer>& outputContainers, std::shared_ptr<armnn::IAsyncExecutionCallback> cb) { for (unsigned int i = 0; i < outputContainers.size(); ++i) |