diff options
| author | Kevin May <kevin.may@arm.com> | 2020-02-26 17:00:39 +0000 |
|---|---|---|
| committer | David Monahan <david.monahan@arm.com> | 2020-03-03 08:40:23 +0000 |
| commit | ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c (patch) | |
| tree | ac4e2d3194012e08241afa9c6691d52608c1a869 /test/FullyConnected.cpp | |
| parent | 4a9565870037150ad6ee060a3cd232d867711b60 (diff) | |
| download | android-nn-driver-ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c.tar.gz | |
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 <kevin.may@arm.com>
Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853
Signed-off-by: Kevin May <kevin.may@arm.com>
Diffstat (limited to 'test/FullyConnected.cpp')
| -rw-r--r-- | test/FullyConnected.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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<uint32_t>{}; - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec<RequestArgument>{input}; request.outputs = hidl_vec<RequestArgument>{output}; @@ -87,10 +87,10 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInput) { auto driver = std::make_unique<ArmnnDriver>(DriverOptions(armnn::Compute::CpuRef)); - ErrorStatus error; + V1_0::ErrorStatus error; std::vector<bool> sup; - ArmnnDriver::getSupportedOperations_cb cb = [&](ErrorStatus status, const std::vector<bool>& supported) + ArmnnDriver::getSupportedOperations_cb cb = [&](V1_0::ErrorStatus status, const std::vector<bool>& supported) { error = status; sup = supported; @@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInput) output.location = outloc; output.dimensions = hidl_vec<uint32_t>{}; - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec<RequestArgument>{input}; request.outputs = hidl_vec<RequestArgument>{output}; @@ -173,10 +173,10 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInputReshape) { auto driver = std::make_unique<ArmnnDriver>(DriverOptions(armnn::Compute::CpuRef)); - ErrorStatus error; + V1_0::ErrorStatus error; std::vector<bool> sup; - ArmnnDriver::getSupportedOperations_cb cb = [&](ErrorStatus status, const std::vector<bool>& supported) + ArmnnDriver::getSupportedOperations_cb cb = [&](V1_0::ErrorStatus status, const std::vector<bool>& supported) { error = status; sup = supported; @@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInputReshape) output.location = outloc; output.dimensions = hidl_vec<uint32_t>{}; - Request request = {}; + V1_0::Request request = {}; request.inputs = hidl_vec<RequestArgument>{input}; request.outputs = hidl_vec<RequestArgument>{output}; |