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/cl/ClLayerSupport.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/cl/ClLayerSupport.cpp')
| -rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index a7c1358ae7..cfc0f11d25 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -14,7 +14,7 @@ #include <boost/core/ignore_unused.hpp> -#ifdef ARMCOMPUTECL_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) #include "workloads/ClAdditionWorkload.hpp" #include "workloads/ClActivationWorkload.hpp" #include "workloads/ClBatchNormalizationFloatWorkload.hpp" @@ -72,7 +72,7 @@ bool IsMatchingStride(uint32_t actualStride) bool IsClBackendSupported(Optional<std::string&> reasonIfUnsupported) { -#if ARMCOMPUTECL_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) return true; #else if (reasonIfUnsupported) @@ -83,13 +83,13 @@ bool IsClBackendSupported(Optional<std::string&> reasonIfUnsupported) #endif } -#if ARMCOMPUTECL_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) #define FORWARD_CL_LAYER_SUPPORT_FUNC(expr) (expr) #else #define FORWARD_CL_LAYER_SUPPORT_FUNC(expr) IsClBackendSupported(reasonIfUnsupported) #endif -#if ARMCOMPUTECL_ENABLED +#if defined(ARMCOMPUTECL_ENABLED) template<class FuncType, class... Args> inline bool IsWorkloadSupported(FuncType&& func, Optional<std::string&> reasonIfUnsupported, Args&&... args) { |