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

Commit 0d792129 authored by Lev Proleev's avatar Lev Proleev Committed by android-build-merger
Browse files

Merge changes from topic "signed_quant_cherry_pick" 

am: 45e64ac5

Change-Id: Ied0c486d38dad9c9770e85305764061efebb3211
parents 6655e46b 45e64ac5

current.txt

+3 −3
Original line number Diff line number Diff line
@@ -575,10 +575,10 @@ cfa81f229b69f9011c58f48264fcb552447430fe68610eac514e811e65bc306a android.hardwar 
b69a7615c508acf5c5201efd1bfa3262167874fc3594e2db5a3ff93addd8ac75 android.hardware.keymaster@4.0::IKeymasterDevice

eb2fa0c883c2185d514be0b84c179b283753ef0c1b77b45b4f359bd23bba8b75 android.hardware.neuralnetworks@1.0::IPreparedModel

f1109cbb10297b7429a11fab42afa912710b303c9bf20bd5cdb8bd57b9c84186 android.hardware.neuralnetworks@1.0::types

9d8ee57c490ffeaa28f702eaea8d198cb510e4bbfb99e6cb5f63e73341057c7c android.hardware.neuralnetworks@1.1::types

5f6d3097ba84cb63c430787123f4de1b31c11f90b531b98eae9a8623a5ae962a android.hardware.neuralnetworks@1.1::types

fb382e986c10b8fbb797a8546e8f9ea6d1107bfe6f3fb7e57f6bbbf1f807a906 android.hardware.neuralnetworks@1.2::IDevice

40e71cd693de5b832325c5d8f081f2ff20a7ba2b89d401cee5b4b3eb0e241681 android.hardware.neuralnetworks@1.2::IPreparedModel

b40eb9dc491e3b203be2edca330ccd0417e9ca77b1b1b0f4c628a5fd269764a2 android.hardware.neuralnetworks@1.2::types

2d5483fbf59d5fd2de94665a6df05da5c3d09de67561d0db5e9f09e59e9aea46 android.hardware.neuralnetworks@1.2::types

a785a57447a81e9c130eef6904c3a5c256076c6a04588c40620ebd6fa2660d77 android.hardware.radio@1.2::types

1a6e2bd289f22931c526b21916910f1d4c436b7acb9556e4243de4ce8e6cc2e4 android.hardware.soundtrigger@2.0::ISoundTriggerHwCallback

fd65298e1e09e0e3c781ab18305920d757dbe55a3b459ce17814ec5cf6dfee99 android.hardware.wifi@1.0::IWifiP2pIface
@@ -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

8900b3a4ef6c0be540821fad0ad8b58b3654b70cfa38df662c640b88ea486d9f android.hardware.neuralnetworks@1.3::types

cf1d55e8c68300090747ab90b94c22e4c859b29c84ced68a317c595bb115eab2 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.1/types.hal

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ enum OperationType : @1.0::OperationType { 
     * Outputs:

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

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

     *      the scale and zeroPoint must be same as input0.

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

     */

    MEAN = 31,

neuralnetworks/1.2/types.hal

+6 −10
Original line number Diff line number Diff line
@@ -1954,7 +1954,7 @@ enum OperationType : int32_t { 
     * Outputs:

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

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

     *      the scale and zeroPoint must be same as input0.

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

     */

    MEAN = @1.1::OperationType:MEAN,
@@ -3141,8 +3141,8 @@ enum OperationType : int32_t { 
     *      {@link SymmPerChannelQuantParams}) must be set to 0.

     * * 2: A 1-D tensor, of shape [depth_out], specifying the bias. For input

     *      tensor of type {@link OperandType::TENSOR_FLOAT32} or

     *      {@link OperandType::TENSOR_FLOAT16}, the bias must be of the same type.

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

     *      {@link OperandType::TENSOR_FLOAT16}, the bias must be of the same

     *      type. For filter tensor of {@link OperandType::TENSOR_QUANT8_ASYMM},

     *      the bias should be of {@link OperandType::TENSOR_INT32}, with zeroPoint

     *      of 0 and bias_scale == input_scale * filter_scale. For filter tensor

     *      of {@link OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL}, the bias
@@ -3181,8 +3181,7 @@ enum OperationType : int32_t { 
     * * 2: A 1-D tensor, of shape [depth_out], specifying the bias. For input

     *      tensor of type {@link OperandType::TENSOR_FLOAT32} or

     *      {@link OperandType::TENSOR_FLOAT16}, the bias must be of the same

     *      {@link OperandType::TENSOR_FLOAT16}, the bias must be of the same type.

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

     *      type. For filter tensor of {@link OperandType::TENSOR_QUANT8_ASYMM},

     *      the bias should be of {@link OperandType::TENSOR_INT32}, with zeroPoint

     *      of 0 and bias_scale == input_scale * filter_scale. For filter tensor

     *      of {@link OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL}, the bias
@@ -3669,17 +3668,14 @@ enum OperationType : int32_t { 
    /**

     * Quantizes the input tensor.

     *

     * The formula for {@link OperandType::TENSOR_QUANT8_ASYMM} output tensor is:

     * The formula is:

     *

     *     output = max(0, min(255, round(input / scale) + zeroPoint)

     *

     * Supported input tensor {@link OperandType}:

     * Supported tensor {@link OperandType}:

     * * {@link OperandType::TENSOR_FLOAT16}

     * * {@link OperandType::TENSOR_FLOAT32}

     *

     * Supported output tensor {@link OperandType}:

     * * {@link OperandType::TENSOR_QUANT8_ASYMM}

     *

     * Supported tensor rank: from 1

     *

     * Inputs:

neuralnetworks/1.3/types.hal

+46 −80

File changed.

Preview size limit exceeded, changes collapsed.