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

Commit 00d2ae59 authored by Lev Proleev's avatar Lev Proleev Committed by Gerrit Code Review
Browse files

Merge changes from topic "quant8_signed_ops" 

* changes:
  Add TENSOR_QUANT8_ASYMM_SIGNED support for activations
  Add TENSOR_QUANT8_ASYMM_SIGNED support for pooling ops
  Add TENSOR_QUANT8_ASYMM_SIGNED support to ADD, MUL and SUB.
parents 23d464a7 cdb67453

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ adb0efdf1462e9b2e742c0dcadd598666aac551f178be06e755bfcdf5797abd0 android.hardwar 
9e59fffceed0dd72a9799e04505db5f777bbbea1af0695ba4107ef6d967c6fda android.hardware.neuralnetworks@1.3::IDevice

4a6c3b3556da951b4def21ba579a227c022980fe4465df6cdfbe20628fa75f5a android.hardware.neuralnetworks@1.3::IPreparedModel

94e803236398bed1febb11cc21051bc42ec003700139b099d6c479e02a7ca3c3 android.hardware.neuralnetworks@1.3::IPreparedModelCallback

554baa3b317e077b850afcbaac99daeef56861b1786540e56275a4fcad1f43e3 android.hardware.neuralnetworks@1.3::types

2d16429145dc1158bf3e45c7de86a39e461dec3ec00512c11a7e5249535a2e96 android.hardware.neuralnetworks@1.3::types

274fb1254a6d1a97824ec5c880eeefc0e410dc6d3a2a4c34052201169d2b7de0 android.hardware.radio@1.5::types

c8e81d912827a5d49b2ddcdc4eb4556c5d231a899a1dca879309e04210daa4a0 android.hardware.radio@1.5::IRadio

a62a93faf173b14a6175b683ebf61ffa568dc61f81e369d2dce7b1265e86cf2f android.hardware.radio@1.5::IRadioIndication

neuralnetworks/1.3/types.hal

+32 −9
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

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

     *

     * Supported tensor rank: up to 4

     *
@@ -116,7 +117,8 @@ enum OperationType : int32_t { 
     * * 0: A tensor.

     * * 1: A tensor of the same {@link OperandType}, and compatible dimensions

     *      as input0.

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

     *      For a {@link OperandType::TENSOR_QUANT8_ASYMM} and

     *      {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} tensor,

     *      the scales and zeroPoint can be different from input0 scale and zeroPoint.

     * * 2: An {@link OperandType::INT32} scalar, and has to be one of the

     *      {@link FusedActivationFunc} values. Specifies the activation to
@@ -124,7 +126,8 @@ enum OperationType : int32_t { 
     *

     * Outputs:

     * * 0: The sum, a tensor of the same {@link OperandType} as input0.

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

     *      For a {@link OperandType::TENSOR_QUANT8_ASYMM} and

     *      {@link OperandType::TENSOR_QUANT8_ASYMM} tensor,

     *      the scale and zeroPoint can be different from inputs' scale and zeroPoint.

     */

    ADD = @1.2::OperationType:ADD,
@@ -146,6 +149,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

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

     *

     * Supported tensor rank: 4, with "NHWC" or "NCHW" data layout.

     * With the default data layout NHWC, the data is stored in the order of:
@@ -207,7 +211,8 @@ enum OperationType : int32_t { 
     * Outputs:

     * * 0: The output 4-D tensor, of shape

     *      [batches, out_height, out_width, depth].

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

     *      For a {@link OperandType::TENSOR_QUANT8_ASYMM} and

     *      {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} tensor,

     *      the scale and zeroPoint must be the same as input0.

     */

    AVERAGE_POOL_2D = @1.2::OperationType:AVERAGE_POOL_2D,
@@ -951,6 +956,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

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

     *

     * Supported tensor rank: up to 4.

     *
@@ -962,6 +968,8 @@ enum OperationType : int32_t { 
     * * 0: The output tensor of same shape as input0.

     *      For {@link OperandType::TENSOR_QUANT8_ASYMM},

     *      the scale must be 1.f / 256 and the zeroPoint must be 0.

     *      For {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED},

     *      the scale must be 1.f / 256 and the zeroPoint must be -128.

     */

    LOGISTIC = @1.2::OperationType:LOGISTIC,
@@ -1256,6 +1264,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

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

     *

     * Supported tensor rank: 4, with "NHWC" or "NCHW" data layout.

     * With the default data layout NHWC, the data is stored in the order of:
@@ -1317,7 +1326,8 @@ enum OperationType : int32_t { 
     * Outputs:

     * * 0: The output 4-D tensor, of shape

     *      [batches, out_height, out_width, depth].

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

     *      For a {@link OperandType::TENSOR_QUANT8_ASYMM} and

     *      {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} tensor,

     *      the scale and zeroPoint must be the same as input0.

     */

    MAX_POOL_2D = @1.2::OperationType:MAX_POOL_2D,
@@ -1345,6 +1355,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

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

     *

     * Supported tensor rank: up to 4

     *
@@ -1358,7 +1369,8 @@ enum OperationType : int32_t { 
     *

     * Outputs:

     * * 0: The product, a tensor of the same {@link OperandType} as input0.

     *      For output tensor of {@link OperandType::TENSOR_QUANT8_ASYMM},

     *      For output tensor of {@link OperandType::TENSOR_QUANT8_ASYMM}

     *      and {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED},

     *      the following condition must be satisfied:

     *      output_scale > input1_scale * input2_scale.

     */
@@ -1375,6 +1387,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

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

     *

     * Supported tensor rank: up to 4.

     *
@@ -1384,7 +1397,8 @@ enum OperationType : int32_t { 
     *

     * Outputs:

     * * 0: The output tensor of same shape as input0.

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

     *      For a {@link OperandType::TENSOR_QUANT8_ASYMM} and

     *      {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} tensor,

     *      the scale and zeroPoint must be the same as input0.

     */

    RELU = @1.2::OperationType:RELU,
@@ -1400,6 +1414,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

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

     *

     * Supported tensor rank: up to 4.

     *
@@ -1409,7 +1424,8 @@ enum OperationType : int32_t { 
     *

     * Outputs:

     * * 0: The output tensor of the same shape as input0.

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

     *      For a {@link OperandType::TENSOR_QUANT8_ASYMM} and

     *      {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} tensor,

     *      the scale and zeroPoint must be the same as input0.

     */

    RELU1 = @1.2::OperationType:RELU1,
@@ -1425,6 +1441,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

     * * {@link OperandType::TENSOR_FLOAT32}

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

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

     *

     * Supported tensor rank: up to 4.

     *
@@ -1434,7 +1451,8 @@ enum OperationType : int32_t { 
     *

     * Outputs:

     * * 0: The output tensor of same shape as input0.

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

     *      For a {@link OperandType::TENSOR_QUANT8_ASYMM} and

     *      {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} tensor,

     *      the scale and zeroPoint must be the same as input0.

     */

    RELU6 = @1.2::OperationType:RELU6,
@@ -1755,6 +1773,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

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

     *

     * Supported tensor rank: up to 4.

     *
@@ -1766,6 +1785,8 @@ enum OperationType : int32_t { 
     * * 0: The output tensor of same shape as input0.

     *      For {@link OperandType::TENSOR_QUANT8_ASYMM},

     *      the scale must be 1.f / 128 and the zeroPoint must be 128.

     *      For {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED},

     *      the scale must be 1.f / 128 and the zeroPoint must be 0.

     */

    TANH = @1.2::OperationType:TANH,
@@ -2083,6 +2104,7 @@ enum OperationType : int32_t { 
     * * {@link OperandType::TENSOR_FLOAT16} (since HAL version 1.2)

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

     *

     * Supported tensor rank: up to 4

     *
@@ -2096,7 +2118,8 @@ enum OperationType : int32_t { 
     *

     * Outputs:

     * * 0: A tensor of the same {@link OperandType} as input0.

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

     *      For a {@link OperandType::TENSOR_QUANT8_ASYMM} and

     *      {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} tensor,

     *      the scale and zeroPoint can be different from inputs' scale and zeroPoint.

     */

    SUB = @1.2::OperationType:SUB,