diff options
| author | Colm Donelan <colm.donelan@arm.com> | 2022-02-02 16:35:09 +0000 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2022-02-07 20:07:44 +0000 |
| commit | c42a987aa53d0fd842c34dee90abef5a9ff15fa4 (patch) | |
| tree | d049993d38a8db54dc18e4c76c998e0598015f18 /src/armnn | |
| parent | 16829713a5d2096c8f0dc989fbb0964a9280777a (diff) | |
| download | armnn-c42a987aa53d0fd842c34dee90abef5a9ff15fa4.tar.gz | |
IVGCVSW-6635 Move MemCopyTestImpl from acl to armnnTestUtils.
* Move MemCopyTestImpl.hpp from src/backends/aclCommon/test/ to
include/armnnTestutils.
* Refactor MemCopyTests in aclCommon, cl and Neon.
* Introduce RefMemCopyTests to exercise this utility in x86 builds.
Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I8824f013d3656658ed0a2904bb79384e3af68641
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/optimizations/FoldPadIntoLayer2d.hpp | 2 | ||||
| -rw-r--r-- | src/armnn/test/TensorHelpers.hpp | 9 | ||||
| -rw-r--r-- | src/armnn/test/optimizations/FuseActivationTests.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/armnn/optimizations/FoldPadIntoLayer2d.hpp b/src/armnn/optimizations/FoldPadIntoLayer2d.hpp index 73188883b2..87117debe9 100644 --- a/src/armnn/optimizations/FoldPadIntoLayer2d.hpp +++ b/src/armnn/optimizations/FoldPadIntoLayer2d.hpp @@ -7,7 +7,7 @@ #include "Optimization.hpp" -#include <QuantizeHelper.hpp> +#include <armnnUtils/QuantizeHelper.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> #include <armnnUtils/DataLayoutIndexed.hpp> diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp index 626cda3d1c..c3571d0c5b 100644 --- a/src/armnn/test/TensorHelpers.hpp +++ b/src/armnn/test/TensorHelpers.hpp @@ -3,7 +3,8 @@ // SPDX-License-Identifier: MIT // -// This file is deprecated and will be removed soon. -// Please use the new header in armnnTestUtils instead. -// This will use the new armnnTestUtils header. -#include "../../armnnTestUtils/TensorHelpers.hpp"
\ No newline at end of file +#pragma message("./src/armnn/test/TensorHelpers.hpp has been deprecated, it" \ + " is due for removal in 22.11 release. Please use public" \ + " interface include/armnnTestUtils/TensorHelpers.hpp") + +#include "armnnTestUtils/TensorHelpers.hpp"
\ No newline at end of file diff --git a/src/armnn/test/optimizations/FuseActivationTests.cpp b/src/armnn/test/optimizations/FuseActivationTests.cpp index 99b2b80556..ac327bb609 100644 --- a/src/armnn/test/optimizations/FuseActivationTests.cpp +++ b/src/armnn/test/optimizations/FuseActivationTests.cpp @@ -13,7 +13,7 @@ #include <doctest/doctest.h> -#include <QuantizeHelper.hpp> +#include <armnnUtils/QuantizeHelper.hpp> #include <string> using namespace armnn; |