diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-31 15:35:59 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-02-01 10:24:15 +0000 |
| commit | d95e906f135ab9c7a7ac4c9f5d2cef8beb154a88 (patch) | |
| tree | da56a3d5b9546409d7860126a46419e5b0eaa7d5 /src/backends/aclCommon/test/MemCopyTests.cpp | |
| parent | 339bcae73515c66899432b5844d7c239c570c4b8 (diff) | |
| download | armnn-d95e906f135ab9c7a7ac4c9f5d2cef8beb154a88.tar.gz | |
IVGCVSW-2603 The macros ARMCOMPUTECL_ENABLED and ARMCOMPUTENEON_ENABLED
no longer work
* Added two master variables ARMNN_COMPUTE_CL_ENABLED and ARMNN_COMPUTE_NEON_ENABLED
to android-nn-driver/Android.mk to easily control backend support
* Setting either of those two new variables then properly sets the
corresponding build macro
* If a specific backend gets disabled, the corresponding source files
will be excluded from the build
* Unified the usage of the pre-compile macros
!android-nn-driver:613
Change-Id: I582ff73493b70ba9e22ca2e38d875a0f19566c8a
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Diffstat (limited to 'src/backends/aclCommon/test/MemCopyTests.cpp')
| -rw-r--r-- | src/backends/aclCommon/test/MemCopyTests.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp index 78cd95b21d..3e26364354 100644 --- a/src/backends/aclCommon/test/MemCopyTests.cpp +++ b/src/backends/aclCommon/test/MemCopyTests.cpp @@ -4,15 +4,14 @@ // #include <aclCommon/ArmComputeTensorUtils.hpp> -#include <cl/ClWorkloadFactory.hpp> -#include <neon/NeonWorkloadFactory.hpp> - -#if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED #include <aclCommon/test/MemCopyTestImpl.hpp> +#if defined(ARMCOMPUTECL_ENABLED) && defined(ARMCOMPUTENEON_ENABLED) +#include <cl/ClWorkloadFactory.hpp> #include <cl/test/ClContextControlFixture.hpp> #include <cl/test/ClWorkloadFactoryHelper.hpp> +#include <neon/NeonWorkloadFactory.hpp> #include <neon/test/NeonWorkloadFactoryHelper.hpp> #endif @@ -41,7 +40,7 @@ BOOST_AUTO_TEST_CASE(AclTypeConversions) BOOST_AUTO_TEST_SUITE_END() -#if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) && defined(ARMCOMPUTENEON_ENABLED) BOOST_FIXTURE_TEST_SUITE(MemCopyClNeon, ClContextControlFixture) @@ -75,4 +74,4 @@ BOOST_AUTO_TEST_CASE(CopyBetweenGpuAndNeonWithSubtensors) BOOST_AUTO_TEST_SUITE_END() -#endif
\ No newline at end of file +#endif |