diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2021-02-12 17:16:42 +0000 |
---|---|---|
committer | Kevin May <kevin.may@arm.com> | 2021-02-15 16:50:24 +0000 |
commit | 188675fd7e7239f56212d72f8ac10598de87e76a (patch) | |
tree | 611876f7c43f81c88b8dec19ae86afcb6d6a1a64 /Utils.cpp | |
parent | cd639c98c347c1addae8c65eb1f4d8e75b468fdb (diff) | |
download | android-nn-driver-188675fd7e7239f56212d72f8ac10598de87e76a.tar.gz |
IVGCVSW-5665 Basic NN Driver support for next OS Version
Signed-off-by: Kevin May <kevin.may@arm.com>
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I1e1db52322092c6b1b7ac6183c3adc90aabcec24
Diffstat (limited to 'Utils.cpp')
-rw-r--r-- | Utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -65,7 +65,7 @@ void SwizzleAndroidNn4dTensorToArmNn(const armnn::TensorInfo& tensor, const void } } -void* GetMemoryFromPool(DataLocation location, const std::vector<android::nn::RunTimePoolInfo>& memPools) +void* GetMemoryFromPool(V1_0::DataLocation location, const std::vector<android::nn::RunTimePoolInfo>& 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(); |