From 2812484ffa1d0ef8f9456d297d05202bea3dac38 Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Tue, 1 Aug 2023 14:57:25 +0100 Subject: Fixing ambiguous method name in BackendHelper. !android-nn-driver:10035 * Two of the 4 HasCapability methods in BackendHelper were checking the value of the capability not just the existence of the capability. Signed-off-by: Colm Donelan Change-Id: I63bc1671dfb088a947de70a21c86d2502f92f008 --- src/backends/backendsCommon/test/CompatibilityTests.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/backends/backendsCommon/test') diff --git a/src/backends/backendsCommon/test/CompatibilityTests.cpp b/src/backends/backendsCommon/test/CompatibilityTests.cpp index a0e5a1e402..2be99498bb 100644 --- a/src/backends/backendsCommon/test/CompatibilityTests.cpp +++ b/src/backends/backendsCommon/test/CompatibilityTests.cpp @@ -139,8 +139,8 @@ void CapabilityTestHelper(BackendCapabilities &capabilities, { CHECK_MESSAGE(armnn::HasCapability(pair.first, capabilities), pair.first << " capability was not been found"); - CHECK_MESSAGE(armnn::HasCapability(BackendOptions::BackendOption{pair.first, pair.second}, capabilities), - pair.first << " capability set incorrectly"); + CHECK_MESSAGE(armnn::HasMatchingCapability(BackendOptions::BackendOption{pair.first, pair.second}, + capabilities), pair.first << " capability set incorrectly"); } } #endif @@ -153,20 +153,20 @@ TEST_CASE("Ref_Backends_Unknown_Capability_Test") auto refCapabilities = refBackend->GetCapabilities(); armnn::BackendOptions::BackendOption AsyncExecutionFalse{"AsyncExecution", false}; - CHECK(!armnn::HasCapability(AsyncExecutionFalse, refCapabilities)); + CHECK(!armnn::HasMatchingCapability(AsyncExecutionFalse, refCapabilities)); armnn::BackendOptions::BackendOption AsyncExecutionInt{"AsyncExecution", 50}; - CHECK(!armnn::HasCapability(AsyncExecutionFalse, refCapabilities)); + CHECK(!armnn::HasMatchingCapability(AsyncExecutionFalse, refCapabilities)); armnn::BackendOptions::BackendOption AsyncExecutionFloat{"AsyncExecution", 0.0f}; - CHECK(!armnn::HasCapability(AsyncExecutionFloat, refCapabilities)); + CHECK(!armnn::HasMatchingCapability(AsyncExecutionFloat, refCapabilities)); armnn::BackendOptions::BackendOption AsyncExecutionString{"AsyncExecution", "true"}; - CHECK(!armnn::HasCapability(AsyncExecutionString, refCapabilities)); + CHECK(!armnn::HasMatchingCapability(AsyncExecutionString, refCapabilities)); CHECK(!armnn::HasCapability("Telekinesis", refCapabilities)); armnn::BackendOptions::BackendOption unknownCapability{"Telekinesis", true}; - CHECK(!armnn::HasCapability(unknownCapability, refCapabilities)); + CHECK(!armnn::HasMatchingCapability(unknownCapability, refCapabilities)); } TEST_CASE ("Ref_Backends_Capability_Test") -- cgit v1.2.1