diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-03-18 10:05:34 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-03-18 12:39:19 +0000 |
| commit | 6fa2638ec2e2cf790c3cdaba1811087e024fbac4 (patch) | |
| tree | faf81ac8cb98d249ca498ebc62097d0f559f9120 | |
| parent | f7a3bf2519a0bdf38e12b3cfa9073dc4f293316d (diff) | |
| download | ComputeLibrary-6fa2638ec2e2cf790c3cdaba1811087e024fbac4.tar.gz | |
COMPMID-1995: Fix compiler issues for invalid min,max arguments.
Change-Id: Iae55fdde57d6e93dec74b9ac398faa9f975ebdcb
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/864
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
| -rw-r--r-- | arm_compute/core/NEON/NEAsymm.h | 2 | ||||
| -rw-r--r-- | src/core/NEON/kernels/NEGEMMLowpOffsetContributionOutputStageKernel.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arm_compute/core/NEON/NEAsymm.h b/arm_compute/core/NEON/NEAsymm.h index 997f28f1f0..f71626182c 100644 --- a/arm_compute/core/NEON/NEAsymm.h +++ b/arm_compute/core/NEON/NEAsymm.h @@ -166,7 +166,7 @@ inline uint8_t finalize_quantization(int32_t in_value, int result_fixedpoint_mul in_value += result_offset_after_shift_s32; // Bound the result - uint8_t out_u8 = static_cast<uint8_t>(std::max(0, std::min(255, in_value))); + uint8_t out_u8 = static_cast<uint8_t>(std::max<int32_t>(0, std::min<int32_t>(255, in_value))); if(is_bounded_relu) { out_u8 = static_cast<uint8_t>(std::max(min_u8, std::min(max_u8, out_u8))); diff --git a/src/core/NEON/kernels/NEGEMMLowpOffsetContributionOutputStageKernel.cpp b/src/core/NEON/kernels/NEGEMMLowpOffsetContributionOutputStageKernel.cpp index ebbea083e3..16a10a8463 100644 --- a/src/core/NEON/kernels/NEGEMMLowpOffsetContributionOutputStageKernel.cpp +++ b/src/core/NEON/kernels/NEGEMMLowpOffsetContributionOutputStageKernel.cpp @@ -291,9 +291,9 @@ inline void run_offset_contribution_output_stage_window(const int32_t *vector_su // Bound and store the result if(is_bounded_relu) { - in_value = static_cast<uint8_t>(std::max(output_stage.gemmlowp_min_bound, std::min(output_stage.gemmlowp_max_bound, in_value))); + in_value = static_cast<uint8_t>(std::max<int32_t>(output_stage.gemmlowp_min_bound, std::min<int32_t>(output_stage.gemmlowp_max_bound, in_value))); } - *(out_it.ptr() + x) = static_cast<uint8_t>(std::max(0, std::min(255, in_value))); + *(out_it.ptr() + x) = static_cast<uint8_t>(std::max<int32_t>(0, std::min<int32_t>(255, in_value))); } } } |