IVGCVSW-3656 Fix wrong rename of the reference backend control macro

 * Renamed ARMNN_COMPUTE_REF_ENABLED to ARMNN_REF_ENABLED in the
   Android makefiles

Change-Id: I12af2ca00c719568274585482d428b035674737c
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>

diff --git a/Android.mk b/Android.mk
index 2a317e0..5dd5a74 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -190,11 +190,11 @@ ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
 LOCAL_CFLAGS += \
         -DARMCOMPUTENEON_ENABLED
 endif # ARMNN_COMPUTE_NEON_ENABLED == 1
-# The variable to enable/disable the REFERENCE backend (ARMNN_COMPUTE_REF_ENABLED) is declared in android-nn-driver/Android.mk
-ifeq ($(ARMNN_COMPUTE_REF_ENABLED),1)
+# The variable to enable/disable the REFERENCE backend (ARMNN_REF_ENABLED) is declared in android-nn-driver/Android.mk
+ifeq ($(ARMNN_REF_ENABLED),1)
 LOCAL_CFLAGS += \
         -DARMNNREF_ENABLED
-endif # ARMNN_COMPUTE_REF_ENABLED == 1
+endif # ARMNN_REF_ENABLED == 1
 
 ifeq ($(Q_OR_LATER),1)
 LOCAL_CFLAGS += \
@@ -263,11 +263,11 @@ ifeq ($(ARMNN_COMPUTE_NEON_ENABLED),1)
 LOCAL_CFLAGS += \
         -DARMCOMPUTENEON_ENABLED
 endif # ARMNN_COMPUTE_NEON_ENABLED == 1
-# The variable to enable/disable the REFERENCE backend (ARMNN_COMPUTE_REF_ENABLED) is declared in android-nn-driver/Android.mk
-ifeq ($(ARMNN_COMPUTE_REF_ENABLED),1)
+# The variable to enable/disable the REFERENCE backend (ARMNN_REF_ENABLED) is declared in android-nn-driver/Android.mk
+ifeq ($(ARMNN_REF_ENABLED),1)
 LOCAL_CFLAGS += \
         -DARMNNREF_ENABLED
-endif # ARMNN_COMPUTE_REF_ENABLED == 1
+endif # ARMNN_REF_ENABLED == 1
 
 ifeq ($(Q_OR_LATER),1)
 LOCAL_CFLAGS += \
@@ -292,7 +292,7 @@ LOCAL_SRC_FILES := \
         src/armnn/test/UnitTests.cpp \
         src/armnn/test/UtilsTests.cpp
 
-ifeq ($(ARMNN_COMPUTE_REF_ENABLED),1)
+ifeq ($(ARMNN_REF_ENABLED),1)
 LOCAL_SRC_FILES += \
         src/armnn/test/DebugCallbackTest.cpp \
         src/armnn/test/RuntimeTests.cpp

diff --git a/src/backends/backendsCommon/common.mk b/src/backends/backendsCommon/common.mk
index 9f09743..b99f18a 100644 (file)
--- a/src/backends/backendsCommon/common.mk
+++ b/src/backends/backendsCommon/common.mk
@@ -43,7 +43,7 @@ COMMON_TEST_SOURCES := \
     test/layerTests/MultiplicationTestImpl.cpp \
     test/layerTests/SubtractionTestImpl.cpp
 
-ifeq ($(ARMNN_COMPUTE_REF_ENABLED),1)
+ifeq ($(ARMNN_REF_ENABLED),1)
 COMMON_TEST_SOURCES += \
     test/WorkloadDataValidation.cpp
-endif # ARMNN_COMPUTE_REF_ENABLED == 1
+endif # ARMNN_REF_ENABLED == 1

diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk
index 1042004..5ad7933 100644 (file)
--- a/src/backends/cl/backend.mk
+++ b/src/backends/cl/backend.mk
@@ -92,10 +92,10 @@ BACKEND_TEST_SOURCES := \
         test/Fp16SupportTest.cpp \
         test/OpenClTimerTest.cpp
 
-ifeq ($(ARMNN_COMPUTE_REF_ENABLED),1)
+ifeq ($(ARMNN_REF_ENABLED),1)
 BACKEND_TEST_SOURCES += \
         test/ClMemCopyTests.cpp
-endif # ARMNN_COMPUTE_REF_ENABLED == 1
+endif # ARMNN_REF_ENABLED == 1
 
 else
 

diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk
index bf7e25d..e29919c 100644 (file)
--- a/src/backends/neon/backend.mk
+++ b/src/backends/neon/backend.mk
@@ -88,10 +88,10 @@ BACKEND_TEST_SOURCES := \
         test/NeonRuntimeTests.cpp \
         test/NeonTimerTest.cpp
 
-ifeq ($(ARMNN_COMPUTE_REF_ENABLED),1)
+ifeq ($(ARMNN_REF_ENABLED),1)
 BACKEND_TEST_SOURCES += \
         test/NeonMemCopyTests.cpp
-endif # ARMNN_COMPUTE_REF_ENABLED == 1
+endif # ARMNN_REF_ENABLED == 1
 
 else
 

diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk
index 13251b7..4bfacd5 100644 (file)
--- a/src/backends/reference/backend.mk
+++ b/src/backends/reference/backend.mk
@@ -7,10 +7,10 @@
 # in the Android build and it is picked up by the Android.mk
 # file in the root of ArmNN
 
-# The variable to enable/disable the reference backend (ARMNN_COMPUTE_REF_ENABLED is declared in android-nn-driver/Android.mk)
-ifeq ($(ARMNN_COMPUTE_REF_ENABLED),1)
+# The variable to enable/disable the reference backend (ARMNN_REF_ENABLED is declared in android-nn-driver/Android.mk)
+ifeq ($(ARMNN_REF_ENABLED),1)
 
-# ARMNN_COMPUTE_REF_ENABLED == 1
+# ARMNN_REF_ENABLED == 1
 # Include the source files for the reference backend
 
 BACKEND_SOURCES := \
@@ -86,7 +86,7 @@ BACKEND_SOURCES := \
         workloads/TransposeConvolution2d.cpp
 else
 
-# ARMNN_COMPUTE_REF_ENABLED == 0
+# ARMNN_REF_ENABLED == 0
 # No source file will be compiled for the reference backend
 
 BACKEND_SOURCES :=
@@ -97,10 +97,10 @@ endif
 # in the Android unit test build (armnn-tests) and it is picked
 # up by the Android.mk file in the root of ArmNN
 
-# The variable to enable/disable the CL backend (ARMNN_COMPUTE_REF_ENABLED is declared in android-nn-driver/Android.mk)
-ifeq ($(ARMNN_COMPUTE_REF_ENABLED),1)
+# The variable to enable/disable the CL backend (ARMNN_REF_ENABLED is declared in android-nn-driver/Android.mk)
+ifeq ($(ARMNN_REF_ENABLED),1)
 
-# ARMNN_COMPUTE_REF_ENABLED == 1
+# ARMNN_REF_ENABLED == 1
 # Include the source files for the CL backend tests
 
 BACKEND_TEST_SOURCES := \
@@ -115,7 +115,7 @@ BACKEND_TEST_SOURCES := \
         test/RefRuntimeTests.cpp
 else
 
-# ARMNN_COMPUTE_REF_ENABLED == 0
+# ARMNN_REF_ENABLED == 0
 # No source file will be compiled for the reference backend tests
 
 BACKEND_TEST_SOURCES :=