tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "AIDL interface changes for NNAPI feature level 6." am: 5dc5f2633f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1827694

Change-Id: If83c8c2759ea0e77534c03d990b618f1f4301879
This commit is contained in:
Ian Hua 2021-10-18 20:17:48 +00:00 committed by Automerger Merge Worker
commit f385f9d59a
8 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
compatibility_matrices/compatibility_matrix.current.xml
View file

@ -396,6 +396,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.neuralnetworks</name>
<version>1-2</version>
<interface>
<name>IDevice</name>
<regex-instance>.*</regex-instance>

2
neuralnetworks/1.3/vts/functional/Android.bp
View file

@ -66,7 +66,7 @@ cc_test {
"VtsHalNeuralNetworksV1_0_utils",
"VtsHalNeuralNetworksV1_2_utils",
"VtsHalNeuralNetworksV1_3_utils",
"android.hardware.neuralnetworks-V1-ndk",
"android.hardware.neuralnetworks-V2-ndk",
"android.hardware.neuralnetworks@1.0",
"android.hardware.neuralnetworks@1.1",
"android.hardware.neuralnetworks@1.2",

1
neuralnetworks/aidl/aidl_api/android.hardware.neuralnetworks/current/android/hardware/neuralnetworks/OperationType.aidl
View file

@ -136,4 +136,5 @@ enum OperationType {
HARD_SWISH = 99,
FILL = 100,
RANK = 101,
BATCH_MATMUL = 102,
}

37
neuralnetworks/aidl/android/hardware/neuralnetworks/OperationType.aidl
View file

@ -1471,6 +1471,7 @@ enum OperationType {
* * {@link OperandType::TENSOR_FLOAT32}
* * {@link OperandType::TENSOR_QUANT8_ASYMM}
* * {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} (since HAL version 1.3)
* * {@link OperandType::TENSOR_INT32} (since NNAPI feature level 6)
*
* Supported tensor rank: up to 4.
*
@ -5236,4 +5237,40 @@ enum OperationType {
* of the input tensor.
*/
RANK = 101,
/**
* Performs multiplication of two tensors in batches.
*
* Multiplies all slices of two input tensors and arranges the individual
* results in a single output tensor of the same batch size. Each pair of
* slices in the same batch have identical {@link OperandType}. Each
* slice can optionally be adjointed (transpose and conjugate) before
* multiplication.
*
* The two input tensors and the output tensor must be 2-D or higher and
* have the same batch size.
*
* Supported tensor {@link OperandType}:
* * {@link OperandType::TENSOR_FLOAT16}
* * {@link OperandType::TENSOR_FLOAT32}
* * {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED}
* * {@link OperandType::TENSOR_INT32}
*
* Supported tensor rank: at least 2 and up to 4
*
* Inputs:
* * 0: A tensor with 2-D or higher shape [..., r_x, c_x].
* * 1: A tensor with 2-D or higher shape [..., r_y, c_y]. It has the same
* {@link OperandType} and batch size as input0.
* * 2: An optional {@link OperandType::BOOL} scalar adj_x, default
* to false. Set to true to adjoint the slices of input0.
* * 3: An optional {@link OperandType::BOOL} scalar adj_y, default
* to false. Set to true to adjoint the slices of input1.
*
* Outputs:
* * 0: A tensor with 2-D or higher shape [..., r_o, c_o], where
* r_o = c_x if adj_x else r_x
* c_o = r_y if adj_y else c_y
*/
BATCH_MATMUL = 102,
}

4
neuralnetworks/aidl/utils/Android.bp
View file

@ -38,7 +38,7 @@ cc_library_static {
"neuralnetworks_utils_hal_common",
],
shared_libs: [
"android.hardware.neuralnetworks-V1-ndk",
"android.hardware.neuralnetworks-V2-ndk",
"libbinder_ndk",
"libhidlbase",
],
@ -58,7 +58,7 @@ cc_test {
static_libs: [
"android.hardware.common-V2-ndk",
"android.hardware.graphics.common-V2-ndk",
"android.hardware.neuralnetworks-V1-ndk",
"android.hardware.neuralnetworks-V2-ndk",
"libaidlcommonsupport",
"libgmock",
"libneuralnetworks_common",

2
neuralnetworks/aidl/vts/functional/Android.bp
View file

@ -51,7 +51,7 @@ cc_test {
static_libs: [
"android.hardware.common-V2-ndk",
"android.hardware.graphics.common-V2-ndk",
"android.hardware.neuralnetworks-V1-ndk",
"android.hardware.neuralnetworks-V2-ndk",
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
"libaidlcommonsupport",

2
neuralnetworks/utils/common/Android.bp
View file

@ -35,7 +35,7 @@ cc_library_static {
"neuralnetworks_types",
],
shared_libs: [
"android.hardware.neuralnetworks-V1-ndk",
"android.hardware.neuralnetworks-V2-ndk",
"libhidlbase",
"libbinder_ndk",
],

2
neuralnetworks/utils/service/Android.bp
View file

@ -39,7 +39,7 @@ cc_library_static {
"neuralnetworks_utils_hal_common",
],
shared_libs: [
"android.hardware.neuralnetworks-V1-ndk",
"android.hardware.neuralnetworks-V2-ndk",
"android.hardware.neuralnetworks@1.0",
"android.hardware.neuralnetworks@1.1",
"android.hardware.neuralnetworks@1.2",