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

Commit cdb67453 authored by Lev Proleev's avatar Lev Proleev
Browse files

Add TENSOR_QUANT8_ASYMM_SIGNED support for activations 

Ops updated: RELU, RELU1, RELU6, TANH, LOGISTIC

Fix: 143933951
Fix: 143934720
Fix: 143933831
Fix: 143934770
Fix: 143934743
Test: quantization coupling tests in CTS and VTS
Change-Id: Id5e7a8c6b30463708bd93dbf6a3f30d05c2bcf40
Merged-In: Id5e7a8c6b30463708bd93dbf6a3f30d05c2bcf40
(cherry picked from commit 3466c78b)
parent d1b3450b

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

6256b2b1df586fc01e80ecf001770d941385602682ec2055ba7b3979a02c8ebf 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

+15 −3
Original line number Diff line number Diff line
@@ -956,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.

     *
@@ -967,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,
@@ -1384,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.

     *
@@ -1393,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,
@@ -1409,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.

     *
@@ -1418,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,
@@ -1434,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.

     *
@@ -1443,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,
@@ -1764,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.

     *
@@ -1775,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,