Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ab31ee5 authored by Ian Hua's avatar Ian Hua Committed by Automerger Merge Worker
Browse files

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

Merge "AIDL interface changes for NNAPI feature level 6." am: 5dc5f263 am: f385f9d5 am: 6dcb9f97 am: 3435a62a

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

Change-Id: I57c26eb8d91b629bcbdaa7cbdca56582bff7e4ae
parents dce5d187 3435a62a

compatibility_matrices/compatibility_matrix.current.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -396,6 +396,7 @@ 
    </hal>

    </hal>

    <hal format="aidl" optional="true">

    <hal format="aidl" optional="true">

        <name>android.hardware.neuralnetworks</name>

        <name>android.hardware.neuralnetworks</name>

        <version>1-2</version>

        <interface>

        <interface>

            <name>IDevice</name>

            <name>IDevice</name>

            <regex-instance>.*</regex-instance>

            <regex-instance>.*</regex-instance>

neuralnetworks/1.3/vts/functional/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ cc_test { 
        "VtsHalNeuralNetworksV1_0_utils",

        "VtsHalNeuralNetworksV1_0_utils",

        "VtsHalNeuralNetworksV1_2_utils",

        "VtsHalNeuralNetworksV1_2_utils",

        "VtsHalNeuralNetworksV1_3_utils",

        "VtsHalNeuralNetworksV1_3_utils",

        "android.hardware.neuralnetworks-V1-ndk",

        "android.hardware.neuralnetworks-V2-ndk",

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

        "android.hardware.neuralnetworks@1.2",

neuralnetworks/aidl/aidl_api/android.hardware.neuralnetworks/current/android/hardware/neuralnetworks/OperationType.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -136,4 +136,5 @@ enum OperationType { 
  HARD_SWISH = 99,

  HARD_SWISH = 99,

  FILL = 100,

  FILL = 100,

  RANK = 101,

  RANK = 101,

  BATCH_MATMUL = 102,

}
 
}

neuralnetworks/aidl/android/hardware/neuralnetworks/OperationType.aidl

+37 −0
Original line number Original line Diff line number Diff line
@@ -1471,6 +1471,7 @@ enum OperationType { 
     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} (since HAL version 1.3)

     * * {@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.

     * Supported tensor rank: up to 4.

     *

     *
@@ -5236,4 +5237,40 @@ enum OperationType { 
     *      of the input tensor.

     *      of the input tensor.

     */

     */

    RANK = 101,

    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,

}
 
}

neuralnetworks/aidl/utils/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ cc_library_static { 
        "neuralnetworks_utils_hal_common",

        "neuralnetworks_utils_hal_common",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "android.hardware.neuralnetworks-V1-ndk",

        "android.hardware.neuralnetworks-V2-ndk",

        "libbinder_ndk",

        "libbinder_ndk",

        "libhidlbase",

        "libhidlbase",

    ],

    ],
@@ -58,7 +58,7 @@ cc_test { 
    static_libs: [

    static_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.graphics.common-V2-ndk",

        "android.hardware.graphics.common-V2-ndk",

        "android.hardware.neuralnetworks-V1-ndk",

        "android.hardware.neuralnetworks-V2-ndk",

        "libaidlcommonsupport",

        "libaidlcommonsupport",

        "libgmock",

        "libgmock",

        "libneuralnetworks_common",

        "libneuralnetworks_common",