aboutsummaryrefslogtreecommitdiff
path: root/ConversionUtils.hpp
AgeCommit message (Collapse)Author
2020-03-31IVGCVSW-4407 HAL 1.3 Operators SupportSadik Armagan
* IVGCVSW-4441 Add Support for ANEURALNETWORKS_ELU * IVGCVSW-4443 Add Support for ANEURALNETWORKS_HARD_SWISH * IVGCVSW-4448 Add TENSOR_QUANT8_ASYMM_SIGNED data type support Signed-off-by: Sadik Armagan <sadik.armagan@arm.com> Change-Id: Idb9bb3f463b956221711423c15b6557eeb1af7db
2020-03-26IVGCVSW-4447 Add Hal 1_3 SupportKevin May
* 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
2020-03-19IVGCVSW-4565 TENSOR_BOOL8 data type not supported in AndroidNN DriverSadik Armagan
* Added TENSOR_BOOL8 support * Added Broadcast support to comparision operators !armnn:2903 Signed-off-by: Sadik Armagan <sadik.armagan@arm.com> Change-Id: I844e32b57399eff2dc60af9b2099145316c80cae
2020-03-11IVGCVSW-4482 Remove boost::ignore_unusedJan Eilers
* replaced boost::ignore_unused with armnn::IgnoreUnused Signed-off-by: Jan Eilers <jan.eilers@arm.com> Change-Id: I4443a3620ed7d51b151af67c070d4225e410b5fa
2020-03-03IVGCVSW-4473 Android R pre Hal 1_3 build changesKevin May
* 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>
2020-02-28IVGCVSW-4375 Add driver support for TransposeMike Kelly
* Changed ConvertTranspose to use Transpose instead of Permute * Removed unused code related to permutation !armnn:2787 Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: Ie59ca80203109bd6bb2abcdedc5ac53c2b2eb157
2020-02-20IVGCVSW-4375 Fixed driver crashesMike Kelly
* Fixed driver crashes caused by ignoring the result of GetTensorInt32Values. * Fixed driver crashes where padding, axis, permutation dimension or block size operands were inputs. Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: I59867e9545a240e6be46b7f68da6adaa120a56d8
2020-01-28MLCE-153 Padding calculation for TransposeConv ignores strideMike Kelly
* Changed ConvertTransposeConv2d to use the unsigned values for strideX and strideY not the signed values from the descriptor. !ComputeLibrary:2599 !armnn:2612 Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: Iee300041f3ed585820b7c7e2edd8ab541f339d59
2020-01-27IVGCVSW-4301 Correctly validate reshape for broadcastable inputsDerek Lamberti
!android-nn-driver:2642 Signed-off-by: Derek Lamberti <derek.lamberti@arm.com> Change-Id: I4db6ea4ed0a192c85f124c4a9ced60b1666a3870 Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
2020-01-24IVGCVSW-4262 Add Calls to IsReshapeSupported and IsPermuteSupportedKevin May
!armnn:2643 * Add calls before addition of these layers in ConvertConcatenation * Add outputInfo parameter wherever needed for IsReshapeSupported Signed-off-by: Kevin May <kevin.may@arm.com> Change-Id: Ic5d142ea046161960ff2fc137bd261ebb4e6ac0c
2020-01-24IVGCVSW-4260 Fix Transpose CpuRef VTS failuresJames Conroy
* Adds missing conversion for permutation vector from ANN/TF/Numpy format to ArmNN format. * Corrects legacy tests based on incorrect permutation vectors. Signed-off-by: James Conroy <james.conroy@arm.com> Change-Id: I767142378055e484d22f3ffba34580c528370cfe
2020-01-13IVGCVSW-3813 Add Unary Elementwise Operation support to the android-nn-driverjosh minor
* Account for deprecated Abs and Rsqrt layers in ArmNN * Update HAL 1.2 * Neg HAL operation support added !armnn:2542 Signed-off-by: josh minor <josh.minor@arm.com> Change-Id: I043bf64ac7ed3aea65560d72acf664e079917baf Signed-off-by: josh minor <josh.minor@arm.com>
2020-01-13Rename quantized data typesDerek Lamberti
!armnn:2571 Signed-off-by: Derek Lamberti <derek.lamberti@arm.com> Change-Id: I06977553a097479a2a996e76a106249673d31ed7
2020-01-09IVGCVSW-4315 Fix Fully Connected infer output shape bugFinnWilliamsArm
Change-Id: If4fd1abdedf7de2046435d418fb1ee95ceb73419 Signed-off-by: FinnWilliamsArm <Finn.Williams@Arm.com>
2020-01-07IVGCVSW-4192 Add DEQUANTIZE to the android-nn-driverKeith Davis
* Support for QSymm8 in ConversionUtils.hpp Signed-off-by: Keith Davis <keith.davis@arm.com> Change-Id: I39c654e7a3821ffe74336a13bf0b922686f337d1
2019-12-06IVGCVSW-4225 Reject dynamic tensors to TRANSPOSEMatthew Bentham
Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com> Change-Id: I1038d4f3c73d4e306161459784a0abf20d7e507d
2019-11-29Catch std::exception instead of armnn::ExceptionDerek Lamberti
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com> Change-Id: I89ae4f3b607ccb83f1bf16e085c805d5fc5cf89c
2019-11-28IVGCVSW-4209 Create a public API for the ArmNN UtilsMatteo Martincigh
* Using the new public armnnUtils API !armnn:2386 Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com> Change-Id: Ifa8af20ca131b1be19dbdceea6674a1274a396f3
2019-11-27MLCE-115 Remove redundant support checking for PermuteMatthew Bentham
This should all be done in the LayerSupport mechanism in Arm NN now. Change-Id: Icbbb1be2efad2ababf8bdd5543f3e5a06958dccd Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
2019-11-25MLCE-144 Fix 2d pooling convert functionFinnWilliamsArm
Signed-off-by: FinnWilliamsArm <Finn.Williams@Arm.com> Change-Id: I999d9091bc4046861433d4eb3109fe972611bd82
2019-11-25Refactor DequantizeIfRequired()Aron Virginas-Tar
* Added DequantizeStatus enum to capture the status of the dequantization process * Added alias DequantizeResult for the return tuple * Renamed instances of Operand, Operation and Model template variables to HalOperand, HalOperation and HalModel for consistency across ConversionUtils Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Change-Id: I2d5cf0dd9f9baba95684bb0b9fe20e63c0f377a3
2019-11-21IVGCVSW-4151 HAL 1_2 Dequantize FP32 Per Channel Tests on CpuAcc FailingSadik Armagan
* Quantization dimension other than 0 is not supported. Signed-off-by: Sadik Armagan <sadik.armagan@arm.com> Change-Id: Ied3914600a754b799e98d5660ad6196c8c4fa23d
2019-11-19IVGCVSW-3697 Add Support for ANEURALNETWORKS_ARG[MAX|MIN] to HAL 1.2 DriverFrancis Murtagh
!armnn:2313 Signed-off-by: Francis Murtagh <francis.murtagh@arm.com> Change-Id: I543136e4e2ef9aece1378d2642064cc585246645
2019-11-18IVGCVSW-4137 Failing LSTM android-nn-driver Unit Tests in HAL 1.2Sadik Armagan
* Fixed for failing LSTM unit tests Signed-off-by: Sadik Armagan <sadik.armagan@arm.com> Change-Id: I773c5227bc8d5606924cc0472c51172476773056
2019-11-18IVGCVSW-4139 Fix regression in ConvertDequantize()Aron Virginas-Tar
* Removed TENSOR_QUANT8_SYMM from the list of generally supported tensor data types * Fixed tensor info in DequantizeIfRequired() for on the fly dequantized QSymm8 weights * Moved code for checking whether a Dequantize operator is linked to FullyConnected or Lstm weights from ConvertDequantize() into a separate function inside 1.2/HalPolicy.cpp Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Change-Id: I19ea6f89a90f553a964b87d44f8ad8a064e96f7f
2019-11-12IVGCVSW-4079 Modify the channel dimension accordingly with the weights ↵Teresa Charlin
permutation Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com> Change-Id: Ie4a27d805d6d953fc54264ef9a0947f82c5b1ff8
2019-11-07MLCE-133 Fixed ASR hero use-casePablo Tello
* Added workaround in FC to deal with non const weights * Added workaround in LSTM to deal with non const weights Signed-off-by: Pablo Tello <pablo.tello@arm.com> Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com> Change-Id: I854eea6a74a6959606ff25b52a0ed80b3e0a18ab
2019-11-06IVGCVSW-3841 Add support for per-axis quantizationAron Virginas-Tar
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Change-Id: Ife7fa63b8839465e8f9f8626f34ca8c0f4d12788
2019-11-01MLCE-143 Fix for reference implementation for service stopping when running CTS.Teresa Charlin
*ConvertDepthwise reports that weights are not supported with the first dimension of the tensor is not 1 *ConvertConcat was missing one case for reporting unsupported inputs. Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com> Change-Id: I7759ad2fea55d272e98b9eabbf4821dc9ac826e1
2019-10-04IVGCVSW-3818 Support Group convolution from AndroidTeresa Charlin
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com> Change-Id: Ie98688175203563ae08019c0c3c876d9c5eae24c
2019-10-02IVGCVSW-3737 Add support for converting DEPTH_TO_SPACEAron Virginas-Tar
* 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
2019-09-09IVGCVSW-3746 Add Android NN Driver support for ABSKevin May
Signed-off-by: Kevin May <kevin.may@arm.com> Change-Id: Icd32bf6f4d5f58e689b55c1c71b0d028155603c8
2019-08-19IVGCVSW-3618 Fix VTS/Neural Netwok Test FailuresSadik Armagan
* Added IsReshapeSupported check on available backend(s) after adding Reshape layer. Signed-off-by: Sadik Armagan <sadik.armagan@arm.com> Change-Id: I38a36d5a3db0d67f0e4b4be2ef672dedb75bff22
2019-08-15IVGCVSW-3643 Fix Ref Normalization failuresMike Kelly
* Added check for unsupported optional parameters for L2Normalization and LocalResponseNormalization to skip the related tests rather than fail them. Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: Ia17be706b14b2e2faf8eb5a0ec335c2e3863bf16
2019-08-14IVGCVSW-3633 Refactor HalPolicy to fully support V1.2 modelsMike Kelly
* 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
2019-08-07IVGCVSW-3540 Fixed PReLU Being SkippedMike Kelly
* PReLU layers were being skipped due to logic error. Resubmitting due to accidental reversion. Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: I6aeed11519d19ba7ec8b4993694e414f58799028
2019-08-02IVGCVSW-3604 Fix TransposeConv2d padding calculationNarumol Prangnawarat
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com> Signed-off-by: Aron Virginas-Tar <aron.virginas-tar@arm.com> Change-Id: I5c10ab18343ecf0ebeab24a436e5be2b6c2831c7
2019-08-01Fix explanatory comment around SanitizeBiasQuantizationScale()Aron Virginas-Tar
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Change-Id: I92700da149a800f1d8215e964d1e67056628f067
2019-07-31IVGCVSW-3601 Fix skipped VTS Concatenate TestsMike Kelly
* Fixed Skipped VTS Concatenate Tests. Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: I29e7dcdedefc0e9c54f86fa5de23aa714c469585
2019-07-31IVGCVSW-3586 Fix Skipped Space_To_Batch Hal 1.2 VTS FailuresFinn Williams
Signed-off-by: Finn Williams <Finn.Williams@arm.com> Change-Id: I9d0d0a75d54c25075d8d87c6265e350486157f5c
2019-07-31IVGCVSW-3583 Correct data layout index for ConvertBatchToSpaceNdFinn Williams
Signed-off-by: Finn Williams <Finn.Williams@arm.com> Change-Id: Ibd683c147b6f2fb966a8f90105c9213880100cf8
2019-07-30IVGCVSW-3583 Fix Skipped Batch_To_Space Hal 1.2 TestsFinn Williams
Signed-off-by: Finn Williams <Finn.Williams@arm.com> Change-Id: I3f2928ba86a9d306a7eb400db3a420e42cf3fa7e
2019-07-30IVGCVSW-3591 Fixed unexpectedly skipped SUB testsMike Kelly
* A model that has Inputs with different quantized scales is not compliant with 1.1 Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: Ifb8277d78f05b5ef017effa879322a08c0efc851
2019-07-29IVGCVSW-3593 Remove HAL1.2-specific code from HAL1.0 ConvertConv2d() and ↵Aron Virginas-Tar
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
2019-07-29IVGCVSW-3540 Fixed PReLU Being SkippedMike Kelly
* PReLU layers were being skipped due to logic error. Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: Ic0ec707da784b44d72958dee02901b0173b25e5c
2019-07-29IVGCVSW-3582 Fix Skipped Pooling Hal 1.2 TestsSadik Armagan
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com> Change-Id: I9f9d11b19de591ec8936822ca229b4090ed318fe
2019-07-26IVGCVSW-3578 Do not attempt to infer dynamic output shapesAron Virginas-Tar
* 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
2019-07-25IVGCVSW-3572 Fix tests failing due to usupported input tensorAron Virginas-Tar
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Change-Id: I55502cf2abcf28a1c1810269f1955ca78b23c39a
2019-07-25IVGCVSW-3530 Fix DynamicOutput Tests for Android Q NeuralNetworks 1.0 & 1.1Sadik Armagan
* 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
2019-07-25Fix verbose logging in ConvertPadAron Virginas-Tar
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Change-Id: I9b1b45f7723147456d2fb9c5b94822d581cf446e
generated by cgit v1.2.1 (git 2.23.0) at 2024-05-03 10:17:28 +0000