diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-08-30 16:02:11 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
commit | 09d3451b4caf8d5e0e7cf2c6097e50a1f815d027 (patch) | |
tree | 8e9b8e9882d0120c85ff08473dbf3721b7602677 /tests/benchmark/fixtures/CannyEdgeFixture.h | |
parent | b57be0da77370e5e71fe82dfa281f528279e8127 (diff) | |
download | ComputeLibrary-09d3451b4caf8d5e0e7cf2c6097e50a1f815d027.tar.gz |
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>
Diffstat (limited to 'tests/benchmark/fixtures/CannyEdgeFixture.h')
-rw-r--r-- | tests/benchmark/fixtures/CannyEdgeFixture.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/tests/benchmark/fixtures/CannyEdgeFixture.h b/tests/benchmark/fixtures/CannyEdgeFixture.h index 099dabaf18..e2aec24b3e 100644 --- a/tests/benchmark/fixtures/CannyEdgeFixture.h +++ b/tests/benchmark/fixtures/CannyEdgeFixture.h @@ -44,7 +44,7 @@ class CannyEdgeFixture : public framework::Fixture { 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 @@ public: 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 @@ public: 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; |