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/1.1/Mean.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/1.1/Mean.cpp') diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp index 529371e1..10ca3aec 100644 --- a/test/1.1/Mean.cpp +++ b/test/1.1/Mean.cpp @@ -78,7 +78,7 @@ void MeanTestImpl(const TestTensor& input, outArg.dimensions = expectedOutput.GetDimensions(); // Make the request based on the arguments - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec{ inArg }; request.outputs = hidl_vec{ outArg }; @@ -89,8 +89,8 @@ void MeanTestImpl(const TestTensor& input, android::sp outMemory = AddPoolAndGetData(expectedOutput.GetNumElements(), request); const float* outputData = static_cast(static_cast(outMemory->getPointer())); - ErrorStatus execStatus = Execute(preparedModel, request); - BOOST_TEST(execStatus == ErrorStatus::NONE); + V1_0::ErrorStatus execStatus = Execute(preparedModel, request); + BOOST_TEST(execStatus == V1_0::ErrorStatus::NONE); const float* expectedOutputData = expectedOutput.GetData(); for (unsigned int i = 0; i < expectedOutput.GetNumElements(); i++) -- cgit v1.2.1