From 188675fd7e7239f56212d72f8ac10598de87e76a Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Fri, 12 Feb 2021 17:16:42 +0000 Subject: IVGCVSW-5665 Basic NN Driver support for next OS Version Signed-off-by: Kevin May Signed-off-by: Sadik Armagan Change-Id: I1e1db52322092c6b1b7ac6183c3adc90aabcec24 --- Utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Utils.cpp') diff --git a/Utils.cpp b/Utils.cpp index 53877bad..930c2b24 100644 --- a/Utils.cpp +++ b/Utils.cpp @@ -65,7 +65,7 @@ void SwizzleAndroidNn4dTensorToArmNn(const armnn::TensorInfo& tensor, const void } } -void* GetMemoryFromPool(DataLocation location, const std::vector& memPools) +void* GetMemoryFromPool(V1_0::DataLocation location, const std::vector& memPools) { // find the location within the pool assert(location.poolIndex < memPools.size()); @@ -695,7 +695,7 @@ void CommitPools(std::vector<::android::nn::RunTimePoolInfo>& memPools) { // Type android::nn::RunTimePoolInfo has changed between Android P & Q and Android R, where // update() has been removed and flush() added. -#if defined(ARMNN_ANDROID_R) // Use the new Android implementation. +#if defined(ARMNN_ANDROID_R) || defined(ARMNN_ANDROID_S) // Use the new Android implementation. pool.flush(); #else pool.update(); -- cgit v1.2.1