From 976ad3e257c4a68e809f5a7fe3b7a99bb3f1fba4 Mon Sep 17 00:00:00 2001 From: Ellen Norris-Thompson 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 Change-Id: Iaf4c2d5f4183ea54799bedae20950b23b914a727 --- test/DriverTestHelpers.cpp | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'test/DriverTestHelpers.cpp') diff --git a/test/DriverTestHelpers.cpp b/test/DriverTestHelpers.cpp index 4c26174b..3a3c98ff 100644 --- a/test/DriverTestHelpers.cpp +++ b/test/DriverTestHelpers.cpp @@ -102,33 +102,6 @@ hidl_memory allocateSharedMemory(int64_t size) return memory; } -android::sp AddPoolAndGetData(uint32_t size, Request& request) -{ - hidl_memory pool; - - android::sp allocator = IAllocator::getService("ashmem"); - allocator->allocate(sizeof(float) * size, [&](bool success, const hidl_memory& mem) { - BOOST_TEST(success); - pool = mem; - }); - - request.pools.resize(request.pools.size() + 1); - request.pools[request.pools.size() - 1] = pool; - - android::sp mapped = mapMemory(pool); - mapped->update(); - return mapped; -} - -void AddPoolAndSetData(uint32_t size, Request& request, const float* data) -{ - android::sp memory = AddPoolAndGetData(size, request); - - float* dst = static_cast(static_cast(memory->getPointer())); - - memcpy(dst, data, size * sizeof(float)); -} - android::sp PrepareModelWithStatus(const V1_0::Model& model, armnn_driver::ArmnnDriver& driver, ErrorStatus& prepareStatus, -- cgit v1.2.1