diff options
author | Kevin May <kevin.may@arm.com> | 2022-04-06 11:41:49 +0100 |
---|---|---|
committer | Kevin May <kevin.may@arm.com> | 2022-05-05 16:33:55 +0100 |
commit | 3edefbb2da1efecebba12cd631ca9697f06db7d4 (patch) | |
tree | 9bd696b65ea697f9314c9999c62084f55bd0f90c /shim/sl/scripts/NeuralNetworks.patch | |
parent | 643355be8a8e94edb66e4586b406343d4342382b (diff) | |
download | armnn-3edefbb2da1efecebba12cd631ca9697f06db7d4.tar.gz |
IVGCVSW-6758 Update SL AOSP repos to use SHA's from master 25/03/22
* Add new SHA's from master 25/03/2 to clone script
* Fix changed AOSP paths in CMakelists
* Add new aosp/external dependencies in CMakeLists
* Update functions with FL8 parameters hints and extensionNameAndPrefix
* Update sharedHandle which changed from having pointer
* Fix broken NeuralNetwork patch after pulling on aosp master
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I5e4b773b87591cec0347c3d739bce9858baed39f
Diffstat (limited to 'shim/sl/scripts/NeuralNetworks.patch')
-rw-r--r-- | shim/sl/scripts/NeuralNetworks.patch | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/shim/sl/scripts/NeuralNetworks.patch b/shim/sl/scripts/NeuralNetworks.patch index c33177e081..81e859bd67 100644 --- a/shim/sl/scripts/NeuralNetworks.patch +++ b/shim/sl/scripts/NeuralNetworks.patch @@ -1,13 +1,17 @@ -diff --git a/common/SharedMemoryAndroid.cpp b/common/SharedMemoryAndroid.cpp -index 4730de36b..896d643e7 100644 ---- a/common/SharedMemoryAndroid.cpp -+++ b/common/SharedMemoryAndroid.cpp -@@ -160,8 +160,19 @@ GeneralResult<SharedMemory> allocateSharedMemory(size_t size) { +diff --git a/common/types/src/SharedMemoryAndroid.cpp b/common/types/src/SharedMemoryAndroid.cpp +index c361a1eb6..3c09c5f4d 100644 +--- a/common/types/src/SharedMemoryAndroid.cpp ++++ b/common/types/src/SharedMemoryAndroid.cpp +@@ -115,8 +115,23 @@ GeneralResult<SharedMemory> allocateSharedMemory(size_t size) { return createSharedMemoryFromUniqueFd(size, prot, std::move(fd), offset); } -GeneralResult<Mapping> map(const Memory::Ashmem& /*memory*/) { - return NN_ERROR(ErrorStatus::INVALID_ARGUMENT) << "Cannot map ashmem memory"; ++//GeneralResult<Mapping> map(const Memory::Ashmem& /*memory*/) { ++// return NN_ERROR(ErrorStatus::INVALID_ARGUMENT) << "Cannot map ashmem memory"; ++//} ++ +GeneralResult<Mapping> map(const Memory::Ashmem& memory) { + constexpr off64_t offset = 0; + constexpr int prot = PROT_READ | PROT_WRITE; @@ -25,15 +29,15 @@ index 4730de36b..896d643e7 100644 #endif // NN_COMPATIBILITY_LIBRARY_BUILD diff --git a/runtime/NeuralNetworks.cpp b/runtime/NeuralNetworks.cpp -index b91d3ce45..8977dac68 100644 +index 678888e9f..805a600bb 100644 --- a/runtime/NeuralNetworks.cpp +++ b/runtime/NeuralNetworks.cpp -@@ -1859,7 +1859,7 @@ int SL_ANeuralNetworksDevice_forEachVendorExtensionOperandTypeInformation( +@@ -1927,7 +1927,7 @@ int SL_ANeuralNetworksDevice_forEachVendorExtensionOperandTypeInformation( #define NNCL_FUNC(symbol) .symbol = symbol - NnApiSLDriverImplFL5 slDriverImpl{ -- .base{.implFeatureLevel = ANEURALNETWORKS_FEATURE_LEVEL_5}, -+ .base={.implFeatureLevel = ANEURALNETWORKS_FEATURE_LEVEL_5}, + NnApiSLDriverImplFL7 slDriverImpl{ +- .base{.implFeatureLevel = ANEURALNETWORKS_FEATURE_LEVEL_7}, ++ .base={.implFeatureLevel = ANEURALNETWORKS_FEATURE_LEVEL_7}, NNCL_FUNC(ANeuralNetworksBurst_create), NNCL_FUNC(ANeuralNetworksBurst_free), NNCL_FUNC(ANeuralNetworksCompilation_createForDevices), |