From 1a39f6d6c0d6caa4b753d9f1542bc8621c5e293d Mon Sep 17 00:00:00 2001 From: Gian Marco Date: Wed, 8 Nov 2017 10:19:21 +0000 Subject: COMPMID-669 - Add validation for different border modes - Box3x3 - Dilate - Erode - Gaussian 3x3 - Gaussian 5x5 - Median 3x3 Change-Id: I09a1a4c6fcdf62805626d73386ec56651bd40fb4 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/94862 Reviewed-by: Anthony Barbier Reviewed-by: Georgios Pinitas Tested-by: Kaizen --- tests/validation/fixtures/Box3x3Fixture.h | 5 +++-- tests/validation/fixtures/DilateFixture.h | 5 +++-- tests/validation/fixtures/ErodeFixture.h | 5 +++-- tests/validation/fixtures/Gaussian3x3Fixture.h | 5 +++-- tests/validation/fixtures/Gaussian5x5Fixture.h | 5 +++-- tests/validation/fixtures/Median3x3Fixture.h | 6 +++--- 6 files changed, 18 insertions(+), 13 deletions(-) (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/Box3x3Fixture.h b/tests/validation/fixtures/Box3x3Fixture.h index a53987a15d..1aa958a11b 100644 --- a/tests/validation/fixtures/Box3x3Fixture.h +++ b/tests/validation/fixtures/Box3x3Fixture.h @@ -52,8 +52,9 @@ public: std::uniform_int_distribution distribution(0, 255); const uint8_t constant_border_value = distribution(gen); - _target = compute_target(shape, data_type, border_mode, constant_border_value); - _reference = compute_reference(shape, data_type, border_mode, constant_border_value); + _border_mode = border_mode; + _target = compute_target(shape, data_type, border_mode, constant_border_value); + _reference = compute_reference(shape, data_type, border_mode, constant_border_value); } protected: diff --git a/tests/validation/fixtures/DilateFixture.h b/tests/validation/fixtures/DilateFixture.h index 0b6fe2ea08..7b56cf6c90 100644 --- a/tests/validation/fixtures/DilateFixture.h +++ b/tests/validation/fixtures/DilateFixture.h @@ -52,8 +52,9 @@ public: std::uniform_int_distribution distribution(0, 255); const uint8_t constant_border_value = distribution(gen); - _target = compute_target(shape, data_type, border_mode, constant_border_value); - _reference = compute_reference(shape, data_type, border_mode, constant_border_value); + _border_mode = border_mode; + _target = compute_target(shape, data_type, border_mode, constant_border_value); + _reference = compute_reference(shape, data_type, border_mode, constant_border_value); } protected: diff --git a/tests/validation/fixtures/ErodeFixture.h b/tests/validation/fixtures/ErodeFixture.h index 86b394fbf3..6ba5fc1e78 100644 --- a/tests/validation/fixtures/ErodeFixture.h +++ b/tests/validation/fixtures/ErodeFixture.h @@ -52,8 +52,9 @@ public: std::uniform_int_distribution distribution(0, 255); const uint8_t constant_border_value = distribution(gen); - _target = compute_target(shape, data_type, border_mode, constant_border_value); - _reference = compute_reference(shape, data_type, border_mode, constant_border_value); + _border_mode = border_mode; + _target = compute_target(shape, data_type, border_mode, constant_border_value); + _reference = compute_reference(shape, data_type, border_mode, constant_border_value); } protected: diff --git a/tests/validation/fixtures/Gaussian3x3Fixture.h b/tests/validation/fixtures/Gaussian3x3Fixture.h index 3b15921d45..72f082e64c 100644 --- a/tests/validation/fixtures/Gaussian3x3Fixture.h +++ b/tests/validation/fixtures/Gaussian3x3Fixture.h @@ -52,8 +52,9 @@ public: std::uniform_int_distribution distribution(0, 255); const uint8_t constant_border_value = distribution(gen); - _target = compute_target(shape, data_type, border_mode, constant_border_value); - _reference = compute_reference(shape, data_type, border_mode, constant_border_value); + _border_mode = border_mode; + _target = compute_target(shape, data_type, border_mode, constant_border_value); + _reference = compute_reference(shape, data_type, border_mode, constant_border_value); } protected: diff --git a/tests/validation/fixtures/Gaussian5x5Fixture.h b/tests/validation/fixtures/Gaussian5x5Fixture.h index b1f7f28cd3..9fdb0d2422 100644 --- a/tests/validation/fixtures/Gaussian5x5Fixture.h +++ b/tests/validation/fixtures/Gaussian5x5Fixture.h @@ -52,8 +52,9 @@ public: std::uniform_int_distribution distribution(0, 255); const uint8_t constant_border_value = distribution(gen); - _target = compute_target(shape, data_type, border_mode, constant_border_value); - _reference = compute_reference(shape, data_type, border_mode, constant_border_value); + _border_mode = border_mode; + _target = compute_target(shape, data_type, border_mode, constant_border_value); + _reference = compute_reference(shape, data_type, border_mode, constant_border_value); } protected: diff --git a/tests/validation/fixtures/Median3x3Fixture.h b/tests/validation/fixtures/Median3x3Fixture.h index 67f4b1b53f..b45e93585a 100644 --- a/tests/validation/fixtures/Median3x3Fixture.h +++ b/tests/validation/fixtures/Median3x3Fixture.h @@ -51,10 +51,10 @@ public: std::mt19937 gen(library->seed()); std::uniform_int_distribution distribution(0, 255); const uint8_t constant_border_value = distribution(gen); - _border_mode = border_mode; - _target = compute_target(shape, data_type, border_mode, constant_border_value); - _reference = compute_reference(shape, data_type, border_mode, constant_border_value); + _border_mode = border_mode; + _target = compute_target(shape, data_type, border_mode, constant_border_value); + _reference = compute_reference(shape, data_type, border_mode, constant_border_value); } protected: -- cgit v1.2.1