commit d95e906f135ab9c7a7ac4c9f5d2cef8beb154a88
author Matteo Martincigh <matteo.martincigh@arm.com> Thu Jan 31 15:35:59 2019 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Fri Feb 01 10:24:15 2019 +0000
tree da56a3d5b9546409d7860126a46419e5b0eaa7d5
parent 339bcae73515c66899432b5844d7c239c570c4b8

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>

src/backends/backendsCommon/test/OptimizedNetworkTests.cpp

diff --git a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp
index 8d88241..7b6135d 100644
--- a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp
+++ b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp
@@ -120,7 +120,7 @@
         // If NEON is enabled, Input and Output layers are supported by CpuAcc,
         // the other layers are supported by CpuRef.
         // If NEON is not enabled, all layers are supported by CpuRef.
-#if ARMCOMPUTENEON_ENABLED
+#if defined(ARMCOMPUTENEON_ENABLED)
         if (layer->GetType() == armnn::LayerType::Input || layer->GetType() == armnn::LayerType::Output)
         {
             BOOST_CHECK(layer->GetBackendId() == armnn::Compute::CpuAcc);
@@ -303,7 +303,7 @@
         // If only CL is enabled, Input and Output layers are supported by GpuAcc,
         // the other layers are supported by CpuRef.
         // If neither NEON, nor CL is enabled, all layers are supported by CpuRef.
-#if ARMCOMPUTENEON_ENABLED
+#if defined(ARMCOMPUTENEON_ENABLED)
         if (layer->GetType() == armnn::LayerType::Input || layer->GetType() == armnn::LayerType::Output)
         {
             BOOST_CHECK(layer->GetBackendId() == armnn::Compute::CpuAcc);
@@ -312,7 +312,7 @@
         {
             BOOST_CHECK(layer->GetBackendId() == armnn::Compute::CpuRef);
         }
-#elif ARMCOMPUTECL_ENABLED
+#elif defined(ARMCOMPUTECL_ENABLED)
         if (layer->GetType() == armnn::LayerType::Input || layer->GetType() == armnn::LayerType::Output)
         {
             BOOST_CHECK(layer->GetBackendId() == armnn::Compute::GpuAcc);