IVGCVSW-3656 Rename ARMCOMPUTEREF to ARMNNREF
* Renamed ARMCOMPUTEREF to ARMNNREF (and relative symbols) as the
previous name was misleading
!android-nn-driver:1822
Change-Id: I912e9f521750b91539e48f8a2fb4de73fb6f7425
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
diff --git a/Android.mk b/Android.mk
index 4b34999..2a317e0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -193,7 +193,7 @@
# 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)
LOCAL_CFLAGS += \
- -DARMCOMPUTEREF_ENABLED
+ -DARMNNREF_ENABLED
endif # ARMNN_COMPUTE_REF_ENABLED == 1
ifeq ($(Q_OR_LATER),1)
@@ -266,7 +266,7 @@
# 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)
LOCAL_CFLAGS += \
- -DARMCOMPUTEREF_ENABLED
+ -DARMNNREF_ENABLED
endif # ARMNN_COMPUTE_REF_ENABLED == 1
ifeq ($(Q_OR_LATER),1)
diff --git a/BuildGuideAndroidNDK.md b/BuildGuideAndroidNDK.md
index 05ec1cf..57b10f8 100644
--- a/BuildGuideAndroidNDK.md
+++ b/BuildGuideAndroidNDK.md
@@ -171,7 +171,7 @@
-DARMCOMPUTE_ROOT=$HOME/armnn-devenv/ComputeLibrary/ \
-DARMCOMPUTE_BUILD_DIR=$HOME/armnn-devenv/ComputeLibrary/build \
-DBOOST_ROOT=$HOME/armnn-devenv/boost/install/ \
- -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMCOMPUTEREF=1 \
+ -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMNNREF=1 \
-DTF_GENERATED_SOURCES=$HOME/armnn-devenv/google/tf_pb/ -DBUILD_TF_PARSER=1 \
-DPROTOBUF_ROOT=$HOME/armnn-devenv/google/arm64_pb_install/
make -j16
diff --git a/BuildGuideCrossCompilation.md b/BuildGuideCrossCompilation.md
index ce0d360..85c46a9 100644
--- a/BuildGuideCrossCompilation.md
+++ b/BuildGuideCrossCompilation.md
@@ -128,7 +128,7 @@
-DARMCOMPUTE_ROOT=$HOME/armnn-devenv/ComputeLibrary \
-DARMCOMPUTE_BUILD_DIR=$HOME/armnn-devenv/ComputeLibrary/build/ \
-DBOOST_ROOT=$HOME/armnn-devenv/boost_arm64_install/ \
- -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMCOMPUTEREF=1 \
+ -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMNNREF=1 \
-DCAFFE_GENERATED_SOURCES=$HOME/armnn-devenv/caffe/build/src \
-DBUILD_CAFFE_PARSER=1 \
-DPROTOBUF_ROOT=$HOME/armnn-devenv/google/x86_64_pb_install/ \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 068768c..8bdcd8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@
target_link_libraries(armnnTfParser ${PROTOBUF_LIBRARIES})
endif()
-if(BUILD_ARMNN_QUANTIZER AND ARMCOMPUTEREF)
+if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
if(NOT BUILD_ARMNN_SERIALIZER)
message(ERROR, "In order to build the ArmNN Quantization Tool you must set BUILD_ARMNN_SERIALIZER = YES")
endif()
@@ -531,7 +531,7 @@
src/profiling/test/ProfilingTests.cpp
)
- if(ARMCOMPUTEREF)
+ if(ARMNNREF)
list(APPEND unittest_sources
src/armnn/test/DebugCallbackTest.cpp
src/armnn/test/QuantizerTest.cpp
@@ -540,7 +540,7 @@
)
endif()
- if(BUILD_TF_PARSER AND ARMCOMPUTEREF)
+ if(BUILD_TF_PARSER AND ARMNNREF)
list(APPEND unittest_sources
src/armnnTfParser/test/Activations.cpp
src/armnnTfParser/test/Addition.cpp
@@ -585,7 +585,7 @@
endif()
- if(BUILD_TF_LITE_PARSER AND ARMCOMPUTEREF)
+ if(BUILD_TF_LITE_PARSER AND ARMNNREF)
enable_language(ASM)
list(APPEND unittest_sources
src/armnnTfLiteParser/test/Activations.cpp
@@ -629,7 +629,7 @@
endif()
- if(BUILD_CAFFE_PARSER AND ARMCOMPUTEREF)
+ if(BUILD_CAFFE_PARSER AND ARMNNREF)
list(APPEND unittest_sources
src/armnnCaffeParser/test/TestAdd.cpp
src/armnnCaffeParser/test/TestConcat.cpp
@@ -644,7 +644,7 @@
)
endif()
- if(BUILD_ONNX_PARSER AND ARMCOMPUTEREF)
+ if(BUILD_ONNX_PARSER AND ARMNNREF)
list(APPEND unittest_sources
src/armnnOnnxParser/test/Constructor.cpp
src/armnnOnnxParser/test/CreateNetwork.cpp
@@ -662,13 +662,13 @@
)
endif()
- if(BUILD_ARMNN_QUANTIZER AND ARMCOMPUTEREF)
+ if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
list(APPEND unittest_sources
src/armnnQuantizer/test/QuantizationDataSetTests.cpp
)
endif()
- if(BUILD_ARMNN_SERIALIZER AND ARMCOMPUTEREF)
+ if(BUILD_ARMNN_SERIALIZER AND ARMNNREF)
enable_language(ASM)
list(APPEND unittest_sources
src/armnnSerializer/test/ActivationSerializationTests.cpp
@@ -743,13 +743,13 @@
target_link_libraries(UnitTests armnnCaffeParser)
endif()
- if(BUILD_ARMNN_SERIALIZER AND ARMCOMPUTEREF)
+ if(BUILD_ARMNN_SERIALIZER AND ARMNNREF)
target_include_directories(UnitTests SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src/armnnSerializer)
target_include_directories(UnitTests SYSTEM PRIVATE "${FLATBUFFERS_INCLUDE_PATH}")
target_link_libraries(UnitTests armnnSerializer)
endif()
- if(BUILD_ARMNN_QUANTIZER AND ARMCOMPUTEREF)
+ if(BUILD_ARMNN_QUANTIZER AND ARMNNREF)
target_include_directories(UnitTests SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src/armnnQuantizer)
target_include_directories(UnitTests SYSTEM PRIVATE "${FLATBUFFERS_INCLUDE_PATH}")
target_link_libraries(UnitTests armnnQuantizer armnnSerializer)
@@ -762,7 +762,7 @@
addDllCopyCommands(UnitTests)
endif()
-if (BUILD_ARMNN_SERIALIZER AND (BUILD_TF_PARSER OR BUILD_TF_LITE_PARSER OR BUILD_ONNX_PARSER OR BUILD_CAFFE_PARSER) AND ARMCOMPUTEREF)
+if (BUILD_ARMNN_SERIALIZER AND (BUILD_TF_PARSER OR BUILD_TF_LITE_PARSER OR BUILD_ONNX_PARSER OR BUILD_CAFFE_PARSER) AND ARMNNREF)
set(ArmnnConverter_sources
src/armnnConverter/ArmnnConverter.cpp)
diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake
index 0063cd1..c94d500 100644
--- a/cmake/GlobalConfig.cmake
+++ b/cmake/GlobalConfig.cmake
@@ -6,7 +6,7 @@
option(BUILD_FOR_COVERAGE "Use no optimization and output .gcno and .gcda files" OFF)
option(ARMCOMPUTENEON "Build with ARM Compute NEON support" OFF)
option(ARMCOMPUTECL "Build with ARM Compute OpenCL support" OFF)
-option(ARMCOMPUTEREF "Build with ARM Compute reference support" OFF)
+option(ARMNNREF "Build with ArmNN reference support" OFF)
option(PROFILING_BACKEND_STREAMLINE "Forward the armNN profiling events to DS-5/Streamline as annotations" OFF)
# options used for heap profiling and leak checking
option(HEAP_PROFILING "Build with heap profiling enabled" OFF)
@@ -290,9 +290,9 @@
include_directories(SYSTEM ${HALF_INCLUDE})
endif()
-# ARM Compute reference backend
-if(ARMCOMPUTEREF)
- add_definitions(-DARMCOMPUTEREF_ENABLED)
+# ArmNN reference backend
+if(ARMNNREF)
+ add_definitions(-DARMNNREF_ENABLED)
endif()
# Streamline annotate
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index c12842d..640d5cd 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(BUILD_SAMPLE_APP AND ARMCOMPUTEREF)
+if(BUILD_SAMPLE_APP AND ARMNNREF)
add_executable(SimpleSample SimpleSample.cpp)
target_link_libraries(SimpleSample armnn ${CMAKE_THREAD_LIBS_INIT})
endif()
diff --git a/src/armnn/test/ProfilerTests.cpp b/src/armnn/test/ProfilerTests.cpp
index 9290e69..b80aedb 100644
--- a/src/armnn/test/ProfilerTests.cpp
+++ b/src/armnn/test/ProfilerTests.cpp
@@ -158,7 +158,7 @@
profiler->EnableProfiling(false);
}
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// This test unit needs the reference backend, it's not available if the reference backend is not built
diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt
index d6f8a6f..2daf3ff 100644
--- a/src/backends/backendsCommon/test/CMakeLists.txt
+++ b/src/backends/backendsCommon/test/CMakeLists.txt
@@ -59,7 +59,7 @@
WorkloadTestUtils.hpp
)
-if (ARMCOMPUTEREF)
+if (ARMNNREF)
list(APPEND armnnBackendsCommonUnitTests_sources
OptimizedNetworkTests.cpp
WorkloadDataValidation.cpp
diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.cpp b/src/backends/backendsCommon/test/DynamicBackendTests.cpp
index 17a99f8..c6606be 100644
--- a/src/backends/backendsCommon/test/DynamicBackendTests.cpp
+++ b/src/backends/backendsCommon/test/DynamicBackendTests.cpp
@@ -61,7 +61,7 @@
ARMNN_SIMPLE_TEST_CASE(RuntimeInvalidDynamicBackends, RuntimeInvalidDynamicBackendsTestImpl);
ARMNN_SIMPLE_TEST_CASE(RuntimeInvalidOverridePath, RuntimeInvalidOverridePathTestImpl);
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// This test unit needs the reference backend, it's not available if the reference backend is not built
diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp
index 6c093fc..4a7ab19 100644
--- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp
+++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp
@@ -1344,7 +1344,7 @@
BOOST_TEST(supportedBackendIds.empty());
}
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// This test unit needs the reference backend, it's not available if the reference backend is not built
diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp
index 1504806..5fd8f3e 100644
--- a/src/backends/backendsCommon/test/LayerTests.cpp
+++ b/src/backends/backendsCommon/test/LayerTests.cpp
@@ -2323,7 +2323,7 @@
return CopyViaSplitterTestImpl<armnn::DataType::QuantisedSymm16>(workloadFactory, memoryManager, 1.0f, 0);
}
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// The LSTM test units are run only for the reference backend at the moment
diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt
index 4ec5051..8f608d1 100644
--- a/src/backends/cl/test/CMakeLists.txt
+++ b/src/backends/cl/test/CMakeLists.txt
@@ -17,7 +17,7 @@
OpenClTimerTest.cpp
)
-if (ARMCOMPUTEREF)
+if (ARMNNREF)
list(APPEND armnnClBackendUnitTests_sources
ClMemCopyTests.cpp
)
diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp
index ff9d23a..833918c 100644
--- a/src/backends/cl/test/ClCreateWorkloadTests.cpp
+++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp
@@ -686,7 +686,7 @@
BOOST_TEST(validDataPointers);
}
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// This test unit needs the reference backend, it's not available if the reference backend is not built
diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index 092aa61..0dfcc22 100644
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -768,7 +768,7 @@
MultiChannelTransposeConvolution2dTest<DataType::QuantisedAsymm8, DataType::Signed32>,
DataLayout::NHWC)
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// The ARMNN_COMPARE_REF_AUTO_TEST_CASE and the ARMNN_COMPARE_REF_FIXTURE_TEST_CASE test units are not available
// if the reference backend is not built
diff --git a/src/backends/neon/test/CMakeLists.txt b/src/backends/neon/test/CMakeLists.txt
index 87929fb..56d745c 100644
--- a/src/backends/neon/test/CMakeLists.txt
+++ b/src/backends/neon/test/CMakeLists.txt
@@ -15,7 +15,7 @@
NeonWorkloadFactoryHelper.hpp
)
-if (ARMCOMPUTEREF)
+if (ARMNNREF)
list(APPEND armnnNeonBackendUnitTests_sources
NeonMemCopyTests.cpp
)
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp
index 6317ac2..e6e1574 100644
--- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp
+++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp
@@ -710,7 +710,7 @@
BOOST_TEST(validDataPointers);
}
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// This test unit needs the reference backend, it's not available if the reference backend is not built
diff --git a/src/backends/neon/test/NeonEndToEndTests.cpp b/src/backends/neon/test/NeonEndToEndTests.cpp
index bee5b7e..54fcfd3 100644
--- a/src/backends/neon/test/NeonEndToEndTests.cpp
+++ b/src/backends/neon/test/NeonEndToEndTests.cpp
@@ -25,7 +25,7 @@
BOOST_TEST(ConstantUsageFloat32Test(defaultBackends));
}
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// This test unit needs the reference backend, it's not available if the reference backend is not built
diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp
index 954f281..fbd8c92 100644
--- a/src/backends/neon/test/NeonLayerTests.cpp
+++ b/src/backends/neon/test/NeonLayerTests.cpp
@@ -856,7 +856,7 @@
MultiChannelTransposeConvolution2dTest<DataType::QuantisedAsymm8, DataType::Signed32>,
DataLayout::NHWC)
-#if defined(ARMCOMPUTEREF_ENABLED)
+#if defined(ARMNNREF_ENABLED)
// The ARMNN_COMPARE_REF_AUTO_TEST_CASE and the ARMNN_COMPARE_REF_FIXTURE_TEST_CASE test units are not available
// if the reference backend is not built
diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt
index ff25378..a6c76c1 100644
--- a/src/backends/reference/CMakeLists.txt
+++ b/src/backends/reference/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: MIT
#
-if(ARMCOMPUTEREF)
+if(ARMNNREF)
list(APPEND armnnRefBackend_sources
RefBackend.cpp
RefBackend.hpp
diff --git a/src/backends/reference/backend.cmake b/src/backends/reference/backend.cmake
index e88968d..01a4ee1 100644
--- a/src/backends/reference/backend.cmake
+++ b/src/backends/reference/backend.cmake
@@ -6,7 +6,7 @@
add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/reference)
list(APPEND armnnLibraries armnnRefBackend)
-if(ARMCOMPUTEREF)
+if(ARMNNREF)
list(APPEND armnnLibraries armnnRefBackendWorkloads)
list(APPEND armnnUnitTestLibraries armnnRefBackendUnitTests)
else()