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/Tests.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/Tests.cpp')
| -rw-r--r-- | test/Tests.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<ArmnnDriver>(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); |