mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-02 20:24:19 +00:00
Merge changes from topic "signed_quant_cherry_pick"
* changes: Add TENSOR_QUANT8_ASYMM_SIGNED support for more ops Add TENSOR_QUANT8_ASYMM_SIGNED support for more ops
This commit is contained in:
Treehugger Robot
Gerrit Code Review
12
current.txt
12
current.txt
@@ -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
|
||||
72de91c3feba4b19c159cd1c413cbea596b78240caa43e31194e20e6f5b05c49 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,13 @@ adb0efdf1462e9b2e742c0dcadd598666aac551f178be06e755bfcdf5797abd0 android.hardwar
|
||||
9e59fffceed0dd72a9799e04505db5f777bbbea1af0695ba4107ef6d967c6fda android.hardware.neuralnetworks@1.3::IDevice
|
||||
4a6c3b3556da951b4def21ba579a227c022980fe4465df6cdfbe20628fa75f5a android.hardware.neuralnetworks@1.3::IPreparedModel
|
||||
94e803236398bed1febb11cc21051bc42ec003700139b099d6c479e02a7ca3c3 android.hardware.neuralnetworks@1.3::IPreparedModelCallback
|
||||
2d16429145dc1158bf3e45c7de86a39e461dec3ec00512c11a7e5249535a2e96 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
|
||||
619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback
|
||||
c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork
|
||||
9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types
|
||||
274fb1254a6d1a97824ec5c880eeefc0e410dc6d3a2a4c34052201169d2b7de0 android.hardware.radio@1.5::types
|
||||
c8e81d912827a5d49b2ddcdc4eb4556c5d231a899a1dca879309e04210daa4a0 android.hardware.radio@1.5::IRadio
|
||||
a62a93faf173b14a6175b683ebf61ffa568dc61f81e369d2dce7b1265e86cf2f android.hardware.radio@1.5::IRadioIndication
|
||||
|
||||
@@ -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,
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
|
||||
@@ -228,6 +228,7 @@ enum OperationType : int32_t {
|
||||
* * {@link OperandType::TENSOR_FLOAT32}
|
||||
* * {@link OperandType::TENSOR_QUANT8_ASYMM}
|
||||
* (full support since HAL version 1.2, see the input section)
|
||||
* * {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} (since HAL version 1.3)
|
||||
*
|
||||
* Supported tensor rank: up to 4
|
||||
*
|
||||
@@ -237,6 +238,9 @@ enum OperationType : int32_t {
|
||||
* Before HAL version 1.2, all input tensors of
|
||||
* {@link OperandType::TENSOR_QUANT8_ASYMM}
|
||||
* must have the same scale and zeroPoint as the output tensor.
|
||||
* Input tensors of
|
||||
* {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED}
|
||||
* are allowed to have different scale and zeroPoint.
|
||||
* Since HAL version 1.2, zero-sized tensors are supported.
|
||||
* * n: An {@link OperandType::INT32} scalar, specifying the
|
||||
* concatenation axis.
|
||||
@@ -247,6 +251,8 @@ enum OperationType : int32_t {
|
||||
* Since HAL version 1.2, for a {@link OperandType::TENSOR_QUANT8_ASYMM} tensor,
|
||||
* the scale and zeroPoint values can be different from
|
||||
* input tensors. Before HAL version 1.2 they have to be the same as for the input tensors.
|
||||
* For a {@link OperandType::TENSOR_QUANT8_ASYMM_SIGNED} tensor,
|
||||
* the scale and zeroPoint values can be different from input tensors.
|
||||
*/
|
||||
CONCATENATION = @1.2::OperationType:CONCATENATION,
|
||||
|
||||
@@ -1467,6 +1473,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.
|
||||
*
|
||||
@@ -1483,7 +1490,8 @@ enum OperationType : int32_t {
|
||||
*
|
||||
* Outputs:
|
||||
* * 0: The output tensor, of shape specified by the input shape.
|
||||
* 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.
|
||||
*/
|
||||
RESHAPE = @1.2::OperationType:RESHAPE,
|
||||
@@ -1882,6 +1890,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
|
||||
*
|
||||
@@ -1901,8 +1910,9 @@ 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.
|
||||
* 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.
|
||||
*/
|
||||
MEAN = @1.2::OperationType:MEAN,
|
||||
|
||||
@@ -2009,6 +2019,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
|
||||
*
|
||||
@@ -2024,7 +2035,8 @@ enum OperationType : int32_t {
|
||||
* * 0: A tensor of the same {@link OperandType} as input0. Contains the
|
||||
* same data as input, but has one or more dimensions of size 1
|
||||
* removed.
|
||||
* 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.
|
||||
*/
|
||||
SQUEEZE = @1.2::OperationType:SQUEEZE,
|
||||
@@ -2042,6 +2054,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
|
||||
*
|
||||
@@ -2071,7 +2084,8 @@ enum OperationType : int32_t {
|
||||
* Outputs:
|
||||
* * 0: A tensor of the same {@link OperandType} as input0 and rank (n - k),
|
||||
* where k is the number of bits set in shrink_axis_mask.
|
||||
* 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.
|
||||
*/
|
||||
STRIDED_SLICE = @1.2::OperationType:STRIDED_SLICE,
|
||||
@@ -3824,6 +3838,7 @@ enum OperationType : int32_t {
|
||||
* * {@link OperandType::TENSOR_FLOAT16}
|
||||
* * {@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
|
||||
*
|
||||
@@ -3836,7 +3851,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 must be the same as input0.
|
||||
*/
|
||||
REDUCE_MAX = @1.2::OperationType:REDUCE_MAX,
|
||||
@@ -3853,6 +3869,7 @@ enum OperationType : int32_t {
|
||||
* * {@link OperandType::TENSOR_FLOAT16}
|
||||
* * {@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
|
||||
*
|
||||
@@ -3865,7 +3882,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 must be the same as input0.
|
||||
*/
|
||||
REDUCE_MIN = @1.2::OperationType:REDUCE_MIN,
|
||||
|
||||
@@ -344,7 +344,17 @@ static bool mutateOperationOperandTypeSkip(size_t operand, OperandType type, con
|
||||
return true;
|
||||
}
|
||||
} break;
|
||||
case OperationType::QUANTIZE:
|
||||
case OperationType::QUANTIZE: {
|
||||
if (operand == operation.inputs[0] &&
|
||||
(type == OperandType::TENSOR_FLOAT16 || type == OperandType::TENSOR_FLOAT32)) {
|
||||
return true;
|
||||
}
|
||||
if (operand == operation.outputs[0] &&
|
||||
(type == OperandType::TENSOR_QUANT8_ASYMM ||
|
||||
type == OperandType::TENSOR_QUANT8_ASYMM_SIGNED)) {
|
||||
return true;
|
||||
}
|
||||
} break;
|
||||
case OperationType::RANDOM_MULTINOMIAL: {
|
||||
if (operand == operation.inputs[0] &&
|
||||
(type == OperandType::TENSOR_FLOAT16 || type == OperandType::TENSOR_FLOAT32)) {
|
||||
|
||||
Reference in New Issue
Block a user