From db16dd33fe124d25ef376b1bec41272d397b67cd Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Tue, 27 Aug 2019 16:41:11 +0100 Subject: IVGCVSW-3656 Rename ARMCOMPUTEREF to ARMNNREF * Renamed ARMCOMPUTEREF to ARMNNREF (and relative symbols) as the previous name was misleading !android-nn-driver:1819 Change-Id: I912e9f521750b91539e48f8a2fb4de73fb6f7425 Signed-off-by: Matteo Martincigh --- src/backends/backendsCommon/test/CMakeLists.txt | 2 +- src/backends/backendsCommon/test/DynamicBackendTests.cpp | 2 +- src/backends/backendsCommon/test/DynamicBackendTests.hpp | 2 +- src/backends/backendsCommon/test/LayerTests.cpp | 2 +- src/backends/cl/test/CMakeLists.txt | 2 +- src/backends/cl/test/ClCreateWorkloadTests.cpp | 2 +- src/backends/cl/test/ClLayerTests.cpp | 2 +- src/backends/neon/test/CMakeLists.txt | 2 +- src/backends/neon/test/NeonCreateWorkloadTests.cpp | 2 +- src/backends/neon/test/NeonEndToEndTests.cpp | 2 +- src/backends/neon/test/NeonLayerTests.cpp | 2 +- src/backends/reference/CMakeLists.txt | 2 +- src/backends/reference/backend.cmake | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/backends') diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 293e5b5103..73574732f3 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -59,7 +59,7 @@ list(APPEND armnnBackendsCommonUnitTests_sources 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 17a99f8b35..c6606be9ff 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.cpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.cpp @@ -61,7 +61,7 @@ ARMNN_SIMPLE_TEST_CASE(RuntimeDuplicateDynamicBackends, RuntimeDuplicateDynamicB 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 6c093fc952..4a7ab19d54 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp @@ -1344,7 +1344,7 @@ void RuntimeInvalidOverridePathTestImpl() 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 1504806998..5fd8f3e641 100644 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -2323,7 +2323,7 @@ LayerTestResult CopyViaSplitterInt16Test( return CopyViaSplitterTestImpl(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 4ec5051fa2..8f608d1ade 100644 --- a/src/backends/cl/test/CMakeLists.txt +++ b/src/backends/cl/test/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND armnnClBackendUnitTests_sources 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 ff9d23a699..833918c727 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -686,7 +686,7 @@ BOOST_AUTO_TEST_CASE(CreateSingleOutputMultipleInputs) 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 092aa61a1f..0dfcc22a49 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -768,7 +768,7 @@ ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dUint8Nhwc, MultiChannelTransposeConvolution2dTest, 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 87929fba43..56d745c2ec 100644 --- a/src/backends/neon/test/CMakeLists.txt +++ b/src/backends/neon/test/CMakeLists.txt @@ -15,7 +15,7 @@ list(APPEND armnnNeonBackendUnitTests_sources 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 6317ac2cc7..e6e1574ae8 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -710,7 +710,7 @@ BOOST_AUTO_TEST_CASE(CreateSingleOutputMultipleInputs) 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 bee5b7e76c..54fcfd34a8 100644 --- a/src/backends/neon/test/NeonEndToEndTests.cpp +++ b/src/backends/neon/test/NeonEndToEndTests.cpp @@ -25,7 +25,7 @@ BOOST_AUTO_TEST_CASE(ConstantUsage_Neon_Float32) 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 954f281144..fbd8c92771 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -856,7 +856,7 @@ ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dUint8Nhwc, MultiChannelTransposeConvolution2dTest, 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 ff253787a1..a6c76c113e 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 e88968de8b..01a4ee132b 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() -- cgit v1.2.1