From edc5ffa62ab7c552539956eba8bb1d56fb48057c Mon Sep 17 00:00:00 2001
From: Kevin May <kevin.may@arm.com>
Date: Wed, 22 May 2019 12:02:53 +0100
Subject: 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
---
 test/1.1/Mean.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'test/1.1/Mean.cpp')

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,
-- 
cgit v1.2.1