Age | Commit message (Collapse) | Author |
|
!armnn:8742
* Done as part of 22.11/23.02 innovation days.
* IsLayerSupported() is called in model prepare (delegate, android-nn-driver and shim/support_library)
and again in ArmNN once model optimization is performed.
* From calling IsLayerSupported() the first time, we should know that the layers are supported
and what backend they are supported on.
* Solution is to set the BackendId of the IConnectableLayer when IsLayerSupported() is called the first time,
* In the Optimize() function we then check if the backend is set. If so, we do not call IsLayerSupported() again.
* In the case a layer that is supported gets optimized, then the BackendId of that layer get set to "Unknown"
for the new optimized layer and IsLayerSupported() will get called on the newly optimized layer.
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: Ie5c6c9cd10d81f90b1ee78dd6e3442f353b6c109
|
|
* Changed asserts to check for errors and return appropriate values or
throw exceptions
* Changed unit tests to use Doctest's long macro names as the short
macro names clashed with Android's Logging macros
* Removed unused #includes
* Clarified ambiguous #includes
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Ice92a37590df727fd581d3be5ff2716665f26a13
|
|
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I2209251736a095583fffc8da774188e0dccfc932
|
|
Signed-off-by: Kevin May <kevin.may@arm.com>
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I1e1db52322092c6b1b7ac6183c3adc90aabcec24
|
|
* Add new 1.3 files HalPolicy, ArmnnDriver, ArmnnDriverImpl
* Add new .rc file for 1.3 service
* Add ArmnnPreparedModel_1_3 and implement new functions
* Update Android.mk with 1.3 driver and service
* Refactor ifdef to include ARMNN_ANDROID_NN_V1_3
* Create Utils getMainModel for new 1.3 Model Main Subgraph
* Use android Utils to convertToV1_X in ArmnnPrepapredModel_1_3
* Refactor HAL 1.2 convert functions into ConversionUtils_1_2.hpp
* Replace ArmnnBurstExecutorWithCache with call to ExecutionBurstServer
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I514069e9e1b16bcd1c4abfb5d563d25ac22d02e3
|
|
* 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>
|
|
Change-Id: If4fd1abdedf7de2046435d418fb1ee95ceb73419
Signed-off-by: FinnWilliamsArm <Finn.Williams@Arm.com>
|
|
* Added ConvertDepthToSpace() to hal_1_0::HalPolicy and hal_1_2::HalPolicy
* Implemented ConvertDepthToSpace() template inside ConversionUtils.hpp
* Changed unsupported operation from DEPTH_TO_SPACE to HASHTABLE_LOOKUP
in GenericLayerTests/GetSupportedOperations
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I12bf73ea721e7b6d49cc4a76000b43a3f274c6f5
|
|
* Templated and moved V1.0 and V1.1 Convert methods to ensure they can work with later versions of models, operations and operands.
* The V1.2 HalPolicy no longer converts V1.2 models, operations and operands to earlier versions.
* The V1.2 HalPolicy no longer passes operations to the V1.1 or V1.0 HalPolicies for conversion.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I5de59d43a3abb1f8ac0253dc637ad68318960c76
|
|
* Fixed Skipped VTS Concatenate Tests.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I29e7dcdedefc0e9c54f86fa5de23aa714c469585
|
|
ConvertDepthwiseConv2d()
* Removed code for reading data layout flag (only available in HAL1.2)
* Removed code for reading dilation parameters (only available in HAL1.2)
* Added more restrictive input size checks (== instead of >=, as none
of the inputs are optional in HAL1.0/1.1)
* Removed superfluous input size validation from 1.0/HalPolicy.cpp
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I8387120b9abcc8458f7fac6df577cb6453051be3
|
|
hal_1_0::HalPolicy
* LocalResponseNormalization
* Mul
* SpaceToDepth
* ResizeBilinear
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ie52dd7b274d721f0ca715ad92277e12e4c2b1913
|
|
* Report dynamic output tensors as unsupported for all operations,
regardless of HAL level
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I2341dc96be965886666b75515e9a226d813a1591
|
|
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ifb6875c8445027f597ad13f29a0c0ae5b94e30ac
|
|
* Fixed for failing Conv2d, DepthwiseConv2d, and Activation tests on Hal 1.0 and 1.1 in Q
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Aron Virginas-Tar <aron.virginas-tar@arm.com>
Change-Id: I435338b90b6c501320083f2fd9372e3a4ac3c32c
|
|
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: If1ce2aff656ff995f41d33777cdc6fb966392cca
|
|
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Idd10f34babc0d2552d599872b853ba5fb5c98351
|
|
Signed-off-by: FinnWilliamsArm <Finn.Williams@arm.com>
Change-Id: Id28e4bd1d55f02c5011f8a364d4b715d1a9190db
|
|
!armnn:1508
Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Change-Id: Ica5fcb683f101bde9e651f0be0f5b9b4c409d1aa
|
|
Signed-off-by: FinnWilliamsArm <Finn.Williams@arm.com>
Change-Id: I2ea4a92ee7ce6282c9fad35deefef99349fe291d
|
|
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Iad2673ffbeb334ab9a39ce09600f476ce96f4165
|
|
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ie1777ec774fe29369b61b0f881cc4b7cef0485a5
|
|
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ifafe2a6fbfd6019b3395d51ed9967db794d2b034
|
|
!armnn:1470
Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Change-Id: I67a393c1556f0b3022436e41f82f2bf1ab3a1d40
|
|
* Added support within 1.0/HalPolicy
* Added support within 1.1/HalPolicy
* Added support within 1.2/HalPolicy
* Updated NnapiSupport.txt
Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I2dc2743ee2f858d2b3496aae0f3e3e28a96ee96e
|
|
* Fix order in which target width and height parameters are read
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I2430abc50f4952a94024d55f8e024cd282d4e0ad
|
|
!armnn:1450
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I901f5093933aa8c1cfa05d8af383ef06a1c1f203
|
|
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I162cdca922655d1bd71b18fc5d2937351f8879be
|
|
* Updated Android.mk to build HAL 1.2 driver
* Added 1.2 HalPolicy and ArmnnDriver
* Added 1.2 ArmnnPreparedModel
* Updated converters and utilities to accept new HAL 1.2 operands and operand types.
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I62856deab24e106f72cccce09468db4971756fa6
|
|
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I734336fe0487198ec03779d3a85706883c137163
|
|
!armnn:1209
Change-Id: Ic493e5cdfe479e459342d7c7c9d77c63f859fa30
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
|
|
!armnn:1182
Change-Id: I8687e33c51593810eef45a4de7d5b856bcab4e3b
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
|
|
* Refactored the code to no longer use the deprecated methods where
applicable
!armnn:1125
Change-Id: I954c8497c098ea3578986eede612c55637fcd3d9
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
|
|
!armnn:1119
Change-Id: Ic187f49427e38345f279537ed10a9275980c1360
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
|
|
Explicitly use HAL V1_0 Operand, OperandType, and IPreparedModelCallback
Change-Id: If6aa6e9dc1bd0b7673ec247ac3560e7f072ef699
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
|
|
Adds new unit test cases, and changes the implementation of
FlattenFullyConnectedInput to more closely match the documentation
of Android NNAPI.
Change-Id: I7ca96b1168b9c7bc78db66f53b0cc776153fd780
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
|
|
Change-Id: Ia4dd63927a54aa0cc24d5a378f30189c957f12e8
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
|
|
Change-Id: I4abe1f750801911570b6dc65c187b828c5929b5f
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
|
|
Change-Id: Ie4b8d92723ecb9834c97c006f3c2f929508176d2
Signed-off-by: David Monahan <david.monahan@arm.com>
|
|
Change-Id: If9f06b5b117972a43b5d1516c27ad350fafc4263
Signed-off-by: Kevin May <kevin.may@arm.com>
|
|
* IsResizeBilinearSupported function requires outputInfo as well.
Change-Id: Ib74241ef2db147bb64fa77287ad0d616a2e4159d
|
|
separate branch) and master
* Minor fixes to make the NN Driver build with the merged changes
* Passed missing ReshapeDescriptor to the layer support function
!armnn:491
Change-Id: I61fb6ed8df6895bd5a12c6f2b1c322929eebe176
|
|
* Changed the weight swizzling to [ M, I, H, W ] as now required by ArmNN
!armnn:460
Change-Id: I7c25e7ab3e1efc47d7db3f2b57e17382ea8b36cf
|
|
* Remove permutation when concat axis is inner most
* Add additional parameter to IsMergerSupported as changed in armnn
!armnn:151
Change-Id: Ie214c9573f242d8f04d58fc61621ad3831991d9a
|
|
Change-Id: I0e967b46b213a3b122e9d6aa564d909d2c546b00
|
|
Change-Id: Iee54c42e9abd927447d958377f3aee266a60ca5d
|
|
Specified NHWC data layout in ResizeBilinear in HAL policy
Change-Id: I0160ec992b595a39ece6d8b060393c5067e8d3a5
|
|
Change-Id: Ic60c4dacb55bcf2514f011a8e844e7b8f7b13560
|
|
* Removed input/output swizzling from ConvertL2Normalization
Change-Id: I623d878617614aec4d1f41556839808e6184a350
|
|
!armnn:151777
Change-Id: Ib7eba10f05810c03d7384256828bfd0c23bb6bba
|