aboutsummaryrefslogtreecommitdiff
path: root/src/core/NEON/kernels/arm_conv/depthwise/depthwise_depthfirst_generic_multiplier.hpp
diff options
context:
space:
mode:
authorGian Marco Iodice <gianmarco.iodice@arm.com>2021-07-29 16:24:36 +0100
committerGian Marco Iodice <gianmarco.iodice@arm.com>2021-07-30 14:31:52 +0000
commit9a1e28b4df4f5b49bb497c8463a8bc7cedaaf110 (patch)
tree72e151bfae03a83019fb4c4da42ffabf5c7a2826 /src/core/NEON/kernels/arm_conv/depthwise/depthwise_depthfirst_generic_multiplier.hpp
parenta76e40347eed7f9f51ec019e08f4ed16f3621e7b (diff)
downloadComputeLibrary-9a1e28b4df4f5b49bb497c8463a8bc7cedaaf110.tar.gz
Compilation issue: neon=1 armv8.2 on Android with NDKr18beta1
- The issue was related to the __fp16 specialization on the depthwise convolution layer (cpu) Resolves COMPMID-4741 Change-Id: I6072230c60df6659951db2a1adf611eca6ab7efe Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com> Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6026 Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/arm_conv/depthwise/depthwise_depthfirst_generic_multiplier.hpp')
-rw-r--r--src/core/NEON/kernels/arm_conv/depthwise/depthwise_depthfirst_generic_multiplier.hpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_depthfirst_generic_multiplier.hpp b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_depthfirst_generic_multiplier.hpp
index 31e5834366..bb580e605a 100644
--- a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_depthfirst_generic_multiplier.hpp
+++ b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_depthfirst_generic_multiplier.hpp
@@ -426,16 +426,7 @@ class DepthwiseDepthfirstGenericWithMultiplier : public DepthwiseDepthfirstGener
// Compute activation values
TAccum activation_min, activation_max;
- if (std::numeric_limits<TAccum>::is_integer)
- {
- activation_min = std::numeric_limits<TAccum>::min();
- activation_max = std::numeric_limits<TAccum>::max();
- }
- else
- {
- activation_min = static_cast<TAccum>(-std::numeric_limits<float>::infinity());
- activation_max = static_cast<TAccum>(std::numeric_limits<float>::infinity());
- }
+ std::tie(activation_min, activation_max) = get_default_activation_values<TAccum>();
switch (this->m_args.activation.type)
{