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/FullyConnected.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/FullyConnected.cpp') diff --git a/test/FullyConnected.cpp b/test/FullyConnected.cpp index e8b5dc26..a6983dd8 100644 --- a/test/FullyConnected.cpp +++ b/test/FullyConnected.cpp @@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(FullyConnected) output.location = outloc; output.dimensions = hidl_vec{}; - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec{input}; request.outputs = hidl_vec{output}; @@ -87,10 +87,10 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInput) { auto driver = std::make_unique(DriverOptions(armnn::Compute::CpuRef)); - ErrorStatus error; + V1_0::ErrorStatus error; std::vector sup; - ArmnnDriver::getSupportedOperations_cb cb = [&](ErrorStatus status, const std::vector& supported) + ArmnnDriver::getSupportedOperations_cb cb = [&](V1_0::ErrorStatus status, const std::vector& supported) { error = status; sup = supported; @@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInput) output.location = outloc; output.dimensions = hidl_vec{}; - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec{input}; request.outputs = hidl_vec{output}; @@ -173,10 +173,10 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInputReshape) { auto driver = std::make_unique(DriverOptions(armnn::Compute::CpuRef)); - ErrorStatus error; + V1_0::ErrorStatus error; std::vector sup; - ArmnnDriver::getSupportedOperations_cb cb = [&](ErrorStatus status, const std::vector& supported) + ArmnnDriver::getSupportedOperations_cb cb = [&](V1_0::ErrorStatus status, const std::vector& supported) { error = status; sup = supported; @@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInputReshape) output.location = outloc; output.dimensions = hidl_vec{}; - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec{input}; request.outputs = hidl_vec{output}; -- cgit v1.2.1