COMPMID-1548: NEON FP16 mismatches on CannyEdge and HarrisCorners.
Removes FP16 from HarrisCorners and CannyEdge.
Change-Id: I5e4f9205fdbe4de85f04f55ecf1568c837e56cc0
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/146247
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
diff --git a/tests/benchmark/fixtures/CannyEdgeFixture.h b/tests/benchmark/fixtures/CannyEdgeFixture.h
index 099daba..e2aec24 100644
--- a/tests/benchmark/fixtures/CannyEdgeFixture.h
+++ b/tests/benchmark/fixtures/CannyEdgeFixture.h
@@ -44,7 +44,7 @@
{
public:
template <typename...>
- void setup(std::string image, int gradient_size, MagnitudeType norm_type, BorderMode border_mode, bool use_fp16, Format format)
+ void setup(std::string image, int gradient_size, MagnitudeType norm_type, BorderMode border_mode, Format format)
{
// Load the image (cached by the library if loaded before)
const RawTensor &raw = library->get(image, format);
@@ -52,7 +52,7 @@
src = create_tensor<TensorType>(raw.shape(), format);
dst = create_tensor<TensorType>(raw.shape(), format);
- configure_target<Function>(canny_edge_func, src, dst, gradient_size, static_cast<int>(norm_type) + 1, border_mode, use_fp16);
+ canny_edge_func.configure(&src, &dst, upper_thresh, lower_thresh, gradient_size, static_cast<int>(norm_type) + 1, border_mode, constant_border_value);
// Allocate tensors
src.allocator()->allocate();
@@ -72,22 +72,6 @@
sync_tensor_if_necessary<TensorType>(dst);
}
-protected:
- template <typename F, typename std::enable_if<std::is_same<F, NECannyEdge>::value, int>::type = 0>
- void configure_target(F &func, TensorType &src, TensorType &dst, int gradient_size, int norm_type, BorderMode border_mode, bool use_fp16)
- {
- func.configure(&src, &dst, upper_thresh, lower_thresh, gradient_size, norm_type, border_mode, constant_border_value, use_fp16);
- }
-
- template <typename F, typename std::enable_if<std::is_same<F, CLCannyEdge>::value, int>::type = 0>
- void configure_target(F &func, TensorType &src, TensorType &dst, int gradient_size, int norm_type, BorderMode border_mode, bool use_fp16)
- {
- ARM_COMPUTE_UNUSED(use_fp16);
- ARM_COMPUTE_ERROR_ON(use_fp16);
-
- func.configure(&src, &dst, upper_thresh, lower_thresh, gradient_size, norm_type, border_mode, constant_border_value);
- }
-
private:
static const int32_t lower_thresh = 0;
static const int32_t upper_thresh = 255;