aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Martincigh <matteo.martincigh@arm.com>2019-08-29 17:10:55 +0100
committerMatteo Martincigh <matteo.martincigh@arm.com>2019-08-29 19:10:44 +0100
commitff645b6e280a846d69079fcf79a49cea801843b7 (patch)
tree2d3f3ce565536e91a99451b4fe70e68ba251422e
parent57130dd869752a2fa5504d1e0e935998ab36e3de (diff)
downloadandroid-nn-driver-ff645b6e280a846d69079fcf79a49cea801843b7.tar.gz
IVGCVSW-3656 Undo wrong rename of the backend control macros
* Renamed the cl/neon backend macros to their original values, as they were renamed by mistake * Reverted misleading comment * Updated the readme file !armnn:1838 Change-Id: I49faabae2c8ad196f51eca5f8dd049ecf74b36e1 Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
-rw-r--r--Android.mk27
-rw-r--r--README.md4
2 files changed, 14 insertions, 17 deletions
diff --git a/Android.mk b/Android.mk
index 2e83e27c..098e49ca 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,24 +38,21 @@ OPENCL_HEADER_PATH := $(LOCAL_PATH)/clframework/include
NN_HEADER_PATH := $(LOCAL_PATH)/../../../frameworks/ml/nn/runtime/include
# Variables to control CL/NEON/reference backend support
-#
-# They can be optionally passed from the command line to build the backends programmatically
-# For example, to disable CL support, do from the top of the Android source tree:
-# ARMNN_COMPUTE_CL_ENABLED=0 make
-# Or export it as an environment variable, export ARMNN_COMPUTE_CL_ENABLED=0, and then run the make command
-#
-# Set the following default values to '0' to disable support for a specific backend
-ifndef ARMNN_COMPUTE_CL_ENABLED
-# ARMNN_COMPUTE_CL_ENABLED is undefined, use the following default value
+# Set them to '0' to disable support for a specific backend
ARMNN_COMPUTE_CL_ENABLED := 1
-endif
-ifndef ARMNN_COMPUTE_NEON_ENABLED
-# ARMNN_COMPUTE_NEON_ENABLED is undefined, use the following default value
ARMNN_COMPUTE_NEON_ENABLED := 1
-endif
-ifndef ARMNN_REF_ENABLED
-# ARMNN_REF_ENABLED is undefined, use the following default value
ARMNN_REF_ENABLED := 1
+
+ifeq ($(ARMNN_COMPUTE_CL_ENABLE),0)
+ARMNN_COMPUTE_CL_ENABLED := 0
+endif
+
+ifeq ($(ARMNN_COMPUTE_NEON_ENABLE),0)
+ARMNN_COMPUTE_NEON_ENABLED := 0
+endif
+
+ifeq ($(ARMNN_REF_ENABLE),0)
+ARMNN_REF_ENABLED := 0
endif
#######################
diff --git a/README.md b/README.md
index 10adc17a..086bf37d 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,8 @@ thus the following should be added to `device.mk` instead:
PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.2-service-armnn
</pre> `Android.mk` contains the module definition of both versions of the ArmNN driver.
-Similarly, the Neon or CL backend can be enabled/disabled by setting ARMNN_COMPUTE_CL_ENABLE or
-ARMNN_COMPUTE_NEON_ENABLE in `device.mk`:
+Similarly, the Neon, CL or reference backend can be enabled/disabled by setting ARMNN_COMPUTE_CL_ENABLE,
+ARMNN_COMPUTE_NEON_ENABLE or ARMNN_REF_ENABLE in `device.mk`:
<pre>
ARMNN_COMPUTE_CL_ENABLE := 1
</pre>