diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2019-08-21 15:03:44 +0100 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-08-21 15:54:04 +0000 |
commit | 1ba9989c4d4fe152d2cb02c83c2da1c18b6aaf37 (patch) | |
tree | 140bb785a4481eab7e1fda62bba4b663ea6c63eb | |
parent | 5eb5f1f8e6ae4d8efbd2c57572f2aa5c4e8805f4 (diff) | |
download | android-nn-driver-1ba9989c4d4fe152d2cb02c83c2da1c18b6aaf37.tar.gz |
IVGCVSW-3512 Update NNAPISupport.txt for 19.08
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: Ie222e046f2fe832ad48d4b2279c8815f860f76d5
-rw-r--r-- | NnapiSupport.txt | 23 | ||||
-rw-r--r-- | README.md | 10 |
2 files changed, 16 insertions, 17 deletions
diff --git a/NnapiSupport.txt b/NnapiSupport.txt index 6f740970..3310f0e1 100644 --- a/NnapiSupport.txt +++ b/NnapiSupport.txt @@ -10,7 +10,7 @@ For integration and usage documentation, please see README.md. --- Support for Android Neural Networks HAL operations --- -The following AndroidNN HAL 1.0 and 1.1 operations are currently supported: +The following AndroidNN HAL 1.0, 1.1 and 1.2 operations are currently supported: AndroidNN operator Tensor type supported ADD (FLOAT32,QUANT8_ASYMM) @@ -28,15 +28,22 @@ L2_POOL_2D (FLOAT32,QUANT8_ASYMM) LOCAL_RESPONSE_NORMALIZATION (FLOAT32) LOGISTIC (FLOAT32,QUANT8_ASYMM) LSTM (FLOAT32) +MAXIMUM (FLOAT32,QUANT8_ASYMM) MAX_POOL_2D (FLOAT32,QUANT8_ASYMM) MEAN (FLOAT32,QUANT8_ASYMM) +MINIMUM (FLOAT32,QUANT8_ASYMM) MUL (FLOAT32,QUANT8_ASYMM) PAD (FLOAT32,QUANT8_ASYMM) +PAD_V2 (FLOAT32,QUANT8_ASYMM) +PRELU (FLOAT32,QUANT8_ASYMM) +QUANTIZE (FLOAT32,QUANT8_ASYMM) +QUANTIZED_16BIT_LSTM (QUANT8_ASYMM) RELU (FLOAT32,QUANT8_ASYMM) RELU1 (FLOAT32,QUANT8_ASYMM) RELU6 (FLOAT32,QUANT8_ASYMM) RESHAPE (FLOAT32,QUANT8_ASYMM) RESIZE_BILINEAR (FLOAT32,QUANT8_ASYMM) +RESIZE_NEAREST_NEIGHBOR (FLOAT32,QUANT8_ASYMM) SOFTMAX (FLOAT32,QUANT8_ASYMM) SPACE_TO_BATCH_ND (FLOAT32,QUANT8_ASYMM) SPACE_TO_DEPTH_ND (FLOAT32,QUANT8_ASYMM) @@ -45,19 +52,6 @@ STRIDED_SLICE (FLOAT32,QUANT8_ASYMM) SUB (FLOAT32,QUANT8_ASYMM) TANH (FLOAT32,QUANT8_ASYMM) TRANSPOSE (FLOAT32,QUANT8_ASYMM) - -The following AndroidNN HAL 1.2 operations are currently supported: - -CONV_2D (FLOAT32,QUANT8_ASYMM) -DEPTHWISE_CONV_2D (FLOAT32,QUANT8_ASYMM) -MAXIMUM (FLOAT32,QUANT8_ASYMM) -MINIMUM (FLOAT32,QUANT8_ASYMM) -PAD_V2 (FLOAT32,QUANT8_ASYMM) -PRELU (FLOAT32,QUANT8_ASYMM) -QUANTIZE (FLOAT32,QUANT8_ASYMM) -QUANTIZED_16BIT_LSTM (QUANT8_ASYMM) -RESIZE_NEAREST_NEIGHBOR (FLOAT32,QUANT8_ASYMM) -SOFTMAX (FLOAT32,QUANT8_ASYMM) TRANSPOSE_CONV_2D (FLOAT32,QUANT8_ASYMM) --- Unsupported operators --- @@ -74,7 +68,6 @@ SVDF The following AndroidNN HAL 1.2 operations are currently not supported: CONCATENATION -LSTM Where operations are not supported by the ArmNN Android NN Driver, the driver indicates this to the framework appropriately and the framework implements those operations using a CPU implementation. @@ -9,10 +9,9 @@ For more information about supported operations and configurations, see NnapiSup ### Prerequisites 1. Android source tree for Android P FSK-R3 or later, in the directory `<ANDROID_ROOT>` +1. Android source tree for Android Q FSK-2 or later, in the directory `<ANDROID_ROOT>` 2. Mali OpenCL driver integrated into the Android source tree -Please Note: ArmNN Neural Networks driver does not currently support Mali OpenCL driver for Android Q. - ### Procedure 1. Place this source directory at `<ANDROID_ROOT>/vendor/arm/android-nn-driver` @@ -34,6 +33,12 @@ thus the following should be added to `device.mk` instead: PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.1-service-armnn </pre> `Android.mk` contains the module definition of both versions of the ArmNN driver. +For Android Q, a new version of the NN API is available (1.2), +thus the following should be added to `device.mk` instead: +<pre> +PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.2-service-armnn +</pre> `Android.mk` contains the module definition of both versions of the ArmNN driver. + Similarly, the Neon or CL backend can be enabled/disabled by setting ARMNN_COMPUTE_CL_ENABLE or ARMNN_COMPUTE_NEON_ENABLE in `device.mk`: <pre> @@ -41,6 +46,7 @@ ARMNN_COMPUTE_CL_ENABLE := 1 </pre> For Android P and Android Q the vendor manifest.xml requires the Neural Network HAL information. +For Android P use HAL version 1.1 as below. For Android Q substitute 1.2 where necessary. ```xml <hal format="hidl"> <name>android.hardware.neuralnetworks</name> |