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

Commit e4f15833 authored by Lev Proleev's avatar Lev Proleev Committed by Xusong Wang
Browse files

NNAPI: Regenerate types.hal to sync with types.spec 

Bug: 147765446
Test: mma
Change-Id: I2b41bd959b7084ecb89674c659c66ebb158ac77d
Merged-In: I2b41bd959b7084ecb89674c659c66ebb158ac77d
(cherry picked from commit 2d7c489f)
parent 95899b3d

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ d1f382d14e1384b907d5bb5780df7f01934650d556fedbed2f15a90773c657d6 android.hardwar 
4167dc3ad35e9cd0d2057d4868c7675ae2c3c9d05bbd614c1f5dccfa5fd68797 android.hardware.neuralnetworks@1.3::IExecutionCallback

7d23020248194abbee8091cc624f39a5a6d7ccba338b172d5d2d3df0cceffbee android.hardware.neuralnetworks@1.3::IPreparedModel

0439a1fbbec7f16e5e4c653d85ac685d51bfafbae15b8f8cca530acdd7d6a8ce android.hardware.neuralnetworks@1.3::IPreparedModelCallback

ee65638f8af3f9f4f222e7208eaa9f1f8e7f8e0a21545846ba67d0e27624efa1 android.hardware.neuralnetworks@1.3::types

162515505235bc770601f02c3537f9ccf11582583bf7b11dd2ec81fab6855333 android.hardware.neuralnetworks@1.3::types

3e01d4446cd69fd1c48f8572efd97487bc179564b32bd795800b97bbe10be37b android.hardware.wifi@1.4::IWifi

a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardware.wifi.supplicant@1.3::ISupplicant

44445b8a03d7b9e68b2fbd954672c18a8fce9e32851b0692f4f4ab3407f86ecb android.hardware.wifi.supplicant@1.3::ISupplicantStaIface

neuralnetworks/1.3/types.hal

+15 −0
Original line number Diff line number Diff line
@@ -1415,6 +1415,7 @@ enum OperationType : int32_t { 
     * * {@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 HAL version 1.3)

     *

     * Supported tensor rank: up to 4

     *
@@ -1425,6 +1426,8 @@ enum OperationType : int32_t { 
     * * 2: An {@link OperandType::INT32} scalar, and has to be one of the

     *      {@link FusedActivationFunc} values. Specifies the activation to

     *      invoke on the result.

     *      For a {@link OperandType::TENSOR_INT32} tensor,

     *      the {@link FusedActivationFunc} must be "NONE".

     *

     * Outputs:

     * * 0: The product, a tensor of the same {@link OperandType} as input0.
@@ -1905,6 +1908,11 @@ enum OperationType : int32_t { 
     * dimensions. The output is the result of dividing the first input tensor

     * by the second, optionally modified by an activation function.

     *

     * For inputs of {@link OperandType::TENSOR_INT32}, performs

     * "floor division" ("//" in Python). For example,

     *     5 // 2 = 2

     *    -5 // 2 = -3

     *

     * Two dimensions are compatible when:

     *     1. they are equal, or

     *     2. one of them is 1
@@ -1925,6 +1933,7 @@ enum OperationType : int32_t { 
     * Supported tensor {@link OperandType}:

     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

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

     *

     * Supported tensor rank: up to 4

     *
@@ -1935,6 +1944,8 @@ enum OperationType : int32_t { 
     * * 2: An {@link OperandType::INT32} scalar, and has to be one of the

     *      {@link FusedActivationFunc} values. Specifies the activation to

     *      invoke on the result.

     *      For a {@link OperandType::TENSOR_INT32} tensor,

     *      the {@link FusedActivationFunc} must be "NONE".

     *

     * Outputs:

     * * 0: A tensor of the same {@link OperandType} as input0.
@@ -2186,6 +2197,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM} (since HAL version 1.2)

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

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

     *

     * Supported tensor rank: up to 4

     *
@@ -2196,6 +2208,8 @@ enum OperationType : int32_t { 
     * * 2: An {@link OperandType::INT32} scalar, and has to be one of the

     *      {@link FusedActivationFunc} values. Specifies the activation to

     *      invoke on the result.

     *      For a {@link OperandType::TENSOR_INT32} tensor,

     *      the {@link FusedActivationFunc} must be "NONE".

     *

     * Outputs:

     * * 0: A tensor of the same {@link OperandType} as input0.
@@ -2242,6 +2256,7 @@ enum OperationType : int32_t { 
     * Supported tensor {@link OperandType}:

     * * {@link OperandType::TENSOR_FLOAT16}

     * * {@link OperandType::TENSOR_FLOAT32}

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

     *

     * Supported tensor rank: from 1.

     *