From 976ad3e257c4a68e809f5a7fe3b7a99bb3f1fba4 Mon Sep 17 00:00:00 2001
From: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
Date: Wed, 21 Aug 2019 15:21:14 +0100
Subject: IVGCVSW-3613 Refactoring Android NN driver for QuantisedLstm test

 * Templated AddPoolAndGetData and AddPoolAndSetData to accept different types
 * Moved scale and offset to arguments of Add*Operand functions

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
Change-Id: Iaf4c2d5f4183ea54799bedae20950b23b914a727
---
 test/1.1/Mean.cpp      | 2 +-
 test/1.1/Transpose.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/1.1')

diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp
index 6e96d84b..529371e1 100644
--- a/test/1.1/Mean.cpp
+++ b/test/1.1/Mean.cpp
@@ -86,7 +86,7 @@ void MeanTestImpl(const TestTensor& input,
     AddPoolAndSetData(input.GetNumElements(), request, input.GetData());
 
     // Add memory for the output
-    android::sp<IMemory> outMemory = AddPoolAndGetData(expectedOutput.GetNumElements(), request);
+    android::sp<IMemory> outMemory = AddPoolAndGetData<float>(expectedOutput.GetNumElements(), request);
     const float* outputData = static_cast<const float*>(static_cast<void*>(outMemory->getPointer()));
 
     ErrorStatus execStatus = Execute(preparedModel, request);
diff --git a/test/1.1/Transpose.cpp b/test/1.1/Transpose.cpp
index f2c77b3f..1b30aa6b 100644
--- a/test/1.1/Transpose.cpp
+++ b/test/1.1/Transpose.cpp
@@ -86,7 +86,7 @@ void TransposeTestImpl(const TestTensor & inputs, int32_t perm[],
                       inputs.GetData());
 
     // add memory for the output
-    android::sp<IMemory> outMemory = AddPoolAndGetData(expectedOutputTensor.GetNumElements(), request);
+    android::sp<IMemory> outMemory = AddPoolAndGetData<float>(expectedOutputTensor.GetNumElements(), request);
     float* outdata = static_cast<float*>(static_cast<void*>(outMemory->getPointer()));
 
     auto execStatus = Execute(preparedModel, request);
-- 
cgit v1.2.1