diff options
author | Kevin May <kevin.may@arm.com> | 2019-05-22 12:02:53 +0100 |
---|---|---|
committer | Kevin May <kevin.may@arm.com> | 2019-05-23 16:22:21 +0100 |
commit | edc5ffa62ab7c552539956eba8bb1d56fb48057c (patch) | |
tree | 553ae127123aa59ebc2823db91e6b7639edee6fa /test/1.1 | |
parent | c6494ccc24d5db72e1a6afc0f71c18b5016027e8 (diff) | |
download | android-nn-driver-edc5ffa62ab7c552539956eba8bb1d56fb48057c.tar.gz |
IVGCVSW-3116 Fix failing NN Driver Tests on Android Q
* Refactor Convolution2d Unit test for fp16Enabled
* Disable GpuAcc for Unit tests in Android Q
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I9613eb325841bdf7d25abf51259fe2f5d973c929
Diffstat (limited to 'test/1.1')
-rw-r--r-- | test/1.1/Mean.cpp | 6 | ||||
-rw-r--r-- | test/1.1/Transpose.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp index 7d482433..cf9ddcb2 100644 --- a/test/1.1/Mean.cpp +++ b/test/1.1/Mean.cpp @@ -18,7 +18,11 @@ using namespace armnn_driver; namespace { -static const boost::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }}; +#ifndef ARMCOMPUTECL_ENABLED + static const boost::array<armnn::Compute, 1> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef }}; +#else + static const boost::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }}; +#endif void MeanTestImpl(const TestTensor& input, const hidl_vec<uint32_t>& axisDimensions, diff --git a/test/1.1/Transpose.cpp b/test/1.1/Transpose.cpp index 6dc3e0ee..e32a25fe 100644 --- a/test/1.1/Transpose.cpp +++ b/test/1.1/Transpose.cpp @@ -21,7 +21,11 @@ using namespace armnn_driver; namespace { -static const boost::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }}; +#ifndef ARMCOMPUTECL_ENABLED + static const boost::array<armnn::Compute, 1> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef }}; +#else + static const boost::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }}; +#endif void TransposeTestImpl(const TestTensor & inputs, int32_t perm[], const TestTensor & expectedOutputTensor, armnn::Compute computeDevice) |