diff options
| author | Kevin May <kevin.may@arm.com> | 2020-02-26 17:00:39 +0000 |
|---|---|---|
| committer | David Monahan <david.monahan@arm.com> | 2020-03-03 08:40:23 +0000 |
| commit | ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c (patch) | |
| tree | ac4e2d3194012e08241afa9c6691d52608c1a869 /Utils.cpp | |
| parent | 4a9565870037150ad6ee060a3cd232d867711b60 (diff) | |
| download | android-nn-driver-ec1e5b8d0a0eeba7eae0f1fdb5e32c72f8a8093c.tar.gz | |
IVGCVSW-4473 Android R pre Hal 1_3 build changes
* Update ErrorStatus to V1_0::ErrorStatus
* Update Request to V1_0::Request
* Update OperandType to V1_2::OperandType
* Add namespace android::nn::hal in ArmnnDriverImpl for R only
* Add missing g_RelaxedFloat32toFloat16PerformancePowerUsageName
* Add namespace V1_0 or V1_1 where necessary
* Update Android.mk with R macro and android.hardware.neuralnetworks@1.3
* Remove androidnn.go
* include IAllocator in DriverTestHelpers
* Remove unused LOCAL_CFLAGS
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I1787f1ed6784b3bbec017536d87d49197405e853
Signed-off-by: Kevin May <kevin.may@arm.com>
Diffstat (limited to 'Utils.cpp')
| -rw-r--r-- | Utils.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -69,13 +69,7 @@ void* GetMemoryFromPool(DataLocation location, const std::vector<android::nn::Ru const android::nn::RunTimePoolInfo& memPool = memPools[location.poolIndex]; - // Type android::nn::RunTimePoolInfo has changed between Android O and Android P, where - // "buffer" has been made private and must be accessed via the accessor method "getBuffer". -#if defined(ARMNN_ANDROID_P) || defined(ARMNN_ANDROID_Q) // Use the new Android implementation. uint8_t* memPoolBuffer = memPool.getBuffer(); -#else // Fallback to the old Android O implementation. - uint8_t* memPoolBuffer = memPool.buffer; -#endif uint8_t* memory = memPoolBuffer + location.offset; |