diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-12-18 15:40:54 +0000 |
|---|---|---|
| committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2019-12-18 18:57:07 +0000 |
| commit | d7d7e9035ca28b1b5200b20a73825397d46830fc (patch) | |
| tree | c8c22e4b069012d57b98265d886c6bf7dc4877ae /src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp | |
| parent | d0bbf0351e560bfd35f248ac6137ce88fff23c30 (diff) | |
| download | ComputeLibrary-d7d7e9035ca28b1b5200b20a73825397d46830fc.tar.gz | |
COMPMID-2819: Update data type auto_init in Elementwise kernels.
Auto initialization functionality is updated in elementwise kernels to
check both data types in order to reason for the output data type
configuration.
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ic08b5567d08a3aaca00942acbdbc8aee19686617
Reviewed-on: https://review.mlplatform.org/c/2495
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp')
| -rw-r--r-- | src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp b/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp index 7ec52f788b..a87588dbb3 100644 --- a/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp +++ b/src/core/NEON/kernels/NEPixelWiseMultiplicationKernel.cpp @@ -70,11 +70,10 @@ inline Status validate_arguments(const ITensorInfo *input1, const ITensorInfo *i ARM_COMPUTE_RETURN_ERROR_ON_MSG(output->data_type() == DataType::U8 && (input1->data_type() != DataType::U8 || input2->data_type() != DataType::U8), "Output can only be U8 if both inputs are U8"); - if(is_data_type_quantized(input1->data_type())|| - is_data_type_quantized(input2->data_type())) + if(is_data_type_quantized(input1->data_type()) || is_data_type_quantized(input2->data_type())) { ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input1, input2); - ARM_COMPUTE_RETURN_ERROR_ON_MSG(overflow_policy == ConvertPolicy::WRAP,"ConvertPolicy cannot be WRAP if datatype is quantized"); + ARM_COMPUTE_RETURN_ERROR_ON_MSG(overflow_policy == ConvertPolicy::WRAP, "ConvertPolicy cannot be WRAP if datatype is quantized"); } if(output->total_size() > 0) @@ -130,15 +129,15 @@ inline std::pair<Status, Window> validate_and_configure_window(ITensorInfo *inpu { set_format_if_unknown(*output, Format::F16); } - else if(input1->data_type() == DataType::QASYMM8) + else if(input1->data_type() == DataType::QASYMM8 || input2->data_type() == DataType::QASYMM8) { set_data_type_if_unknown(*output, DataType::QASYMM8); } - else if(input1->data_type() == DataType::QASYMM8_SIGNED) + else if(input1->data_type() == DataType::QASYMM8_SIGNED || input2->data_type() == DataType::QASYMM8_SIGNED) { set_data_type_if_unknown(*output, DataType::QASYMM8_SIGNED); } - else if(input1->data_type() == DataType::QSYMM16) + else if(input1->data_type() == DataType::QSYMM16 || input2->data_type() == DataType::QSYMM16) { set_data_type_if_unknown(*output, DataType::QSYMM16); } |