commit c60d0fd2cb57f0af7ecc6dc1fc678a9d2a2e629a
author David Monahan <david.monahan@arm.com> Tue May 19 14:58:34 2020 +0100
committer David Monahan <david.monahan@arm.com> Tue May 19 18:15:28 2020 +0100
tree 5a825089eb6c24cebb49b502e6c0404d7b79bd56
parent 813f23049d73177edfc1f1cff71147c39f4b695e

IVGCVSW-IVGCVSW-4772 Fixes for android-nn-driver unit tests on Android R

 * Added missing operand parameter numberOfConsumers to DriverTestHelpers
 * Added nullptr checks to unit tests
 * Disabling QuantizedLstmTest when ARMCOMPUTECL_ENABLED is undefined

Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I46dc413d3bb1805eb0e7c982177b6d60d0b297f5

test/GenericLayerTests.cpp

diff --git a/test/GenericLayerTests.cpp b/test/GenericLayerTests.cpp
index 961ab16..188c7b1 100644
--- a/test/GenericLayerTests.cpp
+++ b/test/GenericLayerTests.cpp
@@ -87,9 +87,19 @@
     // Test Broadcast on add/mul operators
     HalPolicy::Model model2 = {};
 
-    AddInputOperand<HalPolicy>(model2, hidl_vec<uint32_t>{1, 1, 3, 4});
-    AddInputOperand<HalPolicy>(model2, hidl_vec<uint32_t>{4});
-    AddIntOperand<HalPolicy>(model2, actValue);
+    AddInputOperand<HalPolicy>(model2,
+                               hidl_vec<uint32_t>{1, 1, 3, 4},
+                               HalPolicy::OperandType::TENSOR_FLOAT32,
+                               0.0f,
+                               0,
+                               2);
+    AddInputOperand<HalPolicy>(model2,
+                               hidl_vec<uint32_t>{4},
+                               HalPolicy::OperandType::TENSOR_FLOAT32,
+                               0.0f,
+                               0,
+                               2);
+    AddIntOperand<HalPolicy>(model2, actValue, 2);
     AddOutputOperand<HalPolicy>(model2, hidl_vec<uint32_t>{1, 1, 3, 4});
     AddOutputOperand<HalPolicy>(model2, hidl_vec<uint32_t>{1, 1, 3, 4});
 
@@ -181,8 +191,16 @@
                                HalPolicy::OperandType::TENSOR_INT32);
     AddInputOperand<HalPolicy>(model,
                                hidl_vec<uint32_t>{4},
-                               HalPolicy::OperandType::TENSOR_INT32);
-    AddInputOperand<HalPolicy>(model, hidl_vec<uint32_t>{1, 1, 3, 4});
+                               HalPolicy::OperandType::TENSOR_INT32,
+                               0.0f,
+                               0,
+                               2);
+    AddInputOperand<HalPolicy>(model,
+                               hidl_vec<uint32_t>{1, 1, 3, 4},
+                               HalPolicy::OperandType::TENSOR_FLOAT32,
+                               0.0f,
+                               0,
+                               2);
 
     AddOutputOperand<HalPolicy>(model, hidl_vec<uint32_t>{1, 1, 3, 4});
     AddOutputOperand<HalPolicy>(model,