commit 188675fd7e7239f56212d72f8ac10598de87e76a
author Sadik Armagan <sadik.armagan@arm.com> Fri Feb 12 17:16:42 2021 +0000
committer Kevin May <kevin.may@arm.com> Mon Feb 15 16:50:24 2021 +0000
tree 611876f7c43f81c88b8dec19ae86afcb6d6a1a64
parent cd639c98c347c1addae8c65eb1f4d8e75b468fdb

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

ModelToINetworkConverter.cpp

diff --git a/ModelToINetworkConverter.cpp b/ModelToINetworkConverter.cpp
index c205a57..41716b0 100644
--- a/ModelToINetworkConverter.cpp
+++ b/ModelToINetworkConverter.cpp
@@ -11,6 +11,10 @@
 #include <log/log.h>
 #include <type_traits>
 
+#ifdef ARMNN_ANDROID_S
+#include <LegacyUtils.h>
+#endif
+
 namespace armnn_driver
 {
 
@@ -46,13 +50,18 @@
 
     // map the memory pool into shared pointers
     m_Data.m_MemPools.clear();
+#if !defined(ARMNN_ANDROID_S)
     if (!setRunTimePoolInfosFromHidlMemories(&m_Data.m_MemPools, m_Model.pools))
+#else
+    if (!setRunTimePoolInfosFromCanonicalMemories(&m_Data.m_MemPools, uncheckedConvert(m_Model.pools)))
+#endif
     {
         Fail("%s: Setting of run time pool infos from Hidl Memories has failed.", __func__);
         m_ConversionResult = ConversionResult::ErrorMappingPools;
         return;
     }
 
+
     uint32_t totalPoolSize = 0;
     for (auto&& pool : m_Model.pools)
     {