From ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c Mon Sep 17 00:00:00 2001 From: Kevin May Date: Wed, 26 Feb 2020 17:00:39 +0000 Subject: IVGCVSW-4473 Android R pre Hal 1_3 build changes * Update ErrorStatus to V1_0::ErrorStatus * Update Request to V1_0::Request * Update OperandType to V1_2::OperandType * Add namespace android::nn::hal in ArmnnDriverImpl for R only * Add missing g_RelaxedFloat32toFloat16PerformancePowerUsageName * Add namespace V1_0 or V1_1 where necessary * Update Android.mk with R macro and android.hardware.neuralnetworks@1.3 * Remove androidnn.go * include IAllocator in DriverTestHelpers * Remove unused LOCAL_CFLAGS Signed-off-by: Kevin May Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853 Signed-off-by: Kevin May --- test/Tests.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/Tests.cpp') diff --git a/test/Tests.cpp b/test/Tests.cpp index 5c388cb0..3b629a7a 100644 --- a/test/Tests.cpp +++ b/test/Tests.cpp @@ -30,10 +30,10 @@ BOOST_AUTO_TEST_CASE(TestCapabilities) // Making the driver object on the stack causes a weird libc error, so make it on the heap instead auto driver = std::make_unique(DriverOptions(armnn::Compute::CpuRef)); - ErrorStatus error; + V1_0::ErrorStatus error; V1_0::Capabilities cap; - auto cb = [&](ErrorStatus status, const V1_0::Capabilities& capabilities) + auto cb = [&](V1_0::ErrorStatus status, const V1_0::Capabilities& capabilities) { error = status; cap = capabilities; @@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE(TestCapabilities) driver->getCapabilities(cb); - BOOST_TEST((int)error == (int)ErrorStatus::NONE); + BOOST_TEST((int)error == (int)V1_0::ErrorStatus::NONE); BOOST_TEST(cap.float32Performance.execTime > 0.f); BOOST_TEST(cap.float32Performance.powerUsage > 0.f); BOOST_TEST(cap.quantized8Performance.execTime > 0.f); -- cgit v1.2.1