From 2be1b12df67af8a11dd32a024b2b9281b8b672ce Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Fri, 7 May 2021 17:07:09 +0100 Subject: IVGCVSW-5808 Fix ArmNN backend profiling tests which fail on Jenkins with NPU enabled Signed-off-by: Nikhil Raj Change-Id: Ie8f8d9d2dd65d85ed40529233ed45c09f862d602 --- cmake/GlobalConfig.cmake | 4 ---- src/backends/backendsCommon/test/BackendProfilingTests.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index e932020bce..b2f496d29c 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -339,10 +339,6 @@ if(ARMNNREF) add_definitions(-DARMNNREF_ENABLED) endif() -if(ETHOSN_SUPPORT) - add_definitions(-DETHOSN_SUPPORT_ENABLED) -endif() - # This is the root for the dynamic backend tests to search for dynamic # backends. By default it will be the project build directory. add_definitions(-DDYNAMIC_BACKEND_BUILD_DIR="${PROJECT_BINARY_DIR}") diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index d0f8fbe9c3..91399b4887 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -125,10 +125,10 @@ BOOST_AUTO_TEST_CASE(BackendProfilingCounterRegisterMockBackendTest) unsigned int shiftedId = 0; -#if defined(ETHOSN_SUPPORT_ENABLED) - // Shift the id as ETHOSN is enabled. - shiftedId = 4; -#endif + if (armnn::BackendRegistry().IsBackendRegistered("EthosNAcc")) + { + shiftedId = 4; + } // Check if the MockBackends 3 dummy counters {0, 1, 2-5 (four cores)} are registered armnn::BackendId mockId = armnn::MockBackendId(); -- cgit v1.2.1