diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-06-11 16:35:25 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2019-06-11 16:35:25 +0100 |
| commit | b5fdf38f0c6596958fab2b84882f2792a31e585a (patch) | |
| tree | d6b578b51c1923c759653d8a04efa90923ad4dd8 /test | |
| parent | b92f8901fc34749337ea7a9ad7a2717fc9490de5 (diff) | |
| download | android-nn-driver-b5fdf38f0c6596958fab2b84882f2792a31e585a.tar.gz | |
IVGCVSW-3181 Add HAL 1.2 support to android-nn-driver
* Updated Android.mk to build HAL 1.2 driver
* Added 1.2 HalPolicy and ArmnnDriver
* Added 1.2 ArmnnPreparedModel
* Updated converters and utilities to accept new HAL 1.2 operands and operand types.
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I62856deab24e106f72cccce09468db4971756fa6
Diffstat (limited to 'test')
| -rw-r--r-- | test/GenericLayerTests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/GenericLayerTests.cpp b/test/GenericLayerTests.cpp index 63198b4c..ccd4caa2 100644 --- a/test/GenericLayerTests.cpp +++ b/test/GenericLayerTests.cpp @@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE(GetSupportedOperations) driver->getSupportedOperations(model1, cb); -#if defined(ARMNN_ANDROID_P) +#if defined(ARMNN_ANDROID_P) || defined(ARMNN_ANDROID_Q) // In Android P, android::nn::validateModel returns INVALID_ARGUMENT, because of the wrong number of inputs for the // fully connected layer (1 instead of 4) BOOST_TEST((int)errorStatus == (int)ErrorStatus::INVALID_ARGUMENT); |