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 /ModelToINetworkConverter.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 'ModelToINetworkConverter.cpp')
| -rw-r--r-- | ModelToINetworkConverter.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ModelToINetworkConverter.cpp b/ModelToINetworkConverter.cpp index c205a575..41716b0f 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 @@ void ModelToINetworkConverter<HalPolicy>::Convert() // 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) { |