From 53a6ec5944132000e2c6779c04d722b3b2d2501c Mon Sep 17 00:00:00 2001 From: Xinghang Zhou Date: Tue, 14 Nov 2017 15:14:25 +0800 Subject: APPBROWSER-304,342: Add exclude padding support for OpenGL ES implementation and implement MaxPool operators Change-Id: Ie6ba36ff114feec2a21739dba11bbb60b76af443 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/113697 Tested-by: Jenkins Reviewed-by: Stephen Li Reviewed-by: Pablo Tello Reviewed-by: Anthony Barbier --- tests/validation/GLES_COMPUTE/PoolingLayer.cpp | 60 +++++++++++++++++--------- 1 file changed, 39 insertions(+), 21 deletions(-) (limited to 'tests/validation/GLES_COMPUTE') diff --git a/tests/validation/GLES_COMPUTE/PoolingLayer.cpp b/tests/validation/GLES_COMPUTE/PoolingLayer.cpp index 4bfaf245be..e789dbab07 100644 --- a/tests/validation/GLES_COMPUTE/PoolingLayer.cpp +++ b/tests/validation/GLES_COMPUTE/PoolingLayer.cpp @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#if 0 // FIXME(APPBROWSER-304): Add exclude padding support for OpenGL ES implementation #include "arm_compute/core/Types.h" #include "arm_compute/runtime/GLES_COMPUTE/GCTensor.h" #include "arm_compute/runtime/GLES_COMPUTE/GCTensorAllocator.h" @@ -44,21 +43,45 @@ namespace validation { namespace { -// FIXME(APPBROWSER-304): Add exclude padding support for OpenGL ES implementation -/** Input data set for float data types */ +/** Input data set for floating-point data types */ const auto PoolingLayerDatasetFP = combine(combine(combine(datasets::PoolingTypes(), framework::dataset::make("PoolingSize", { 2, 3, 4, 7, 9 })), framework::dataset::make("PadStride", { PadStrideInfo(1, 1, 0, 0), PadStrideInfo(2, 1, 0, 0), PadStrideInfo(1, 2, 1, 1), PadStrideInfo(2, 2, 1, 0) })), - framework::dataset::make("ExcludePadding", { /* true, */ false })); - -// FIXME(APPBROWSER-304): Add exclude padding support for OpenGL ES implementation -// constexpr AbsoluteTolerance tolerance_f32(0.001f); /**< Tolerance value for comparing reference's output against implementation's output for float types */ -// constexpr AbsoluteTolerance tolerance_f16(0.01f); /**< Tolerance value for comparing reference's output against implementation's output for float types */ + framework::dataset::make("ExcludePadding", { true, false })); +constexpr AbsoluteTolerance tolerance_f32(0.001f); /**< Tolerance value for comparing reference's output against implementation's output for 32-bit floating-point type */ +constexpr AbsoluteTolerance tolerance_f16(0.01f); /**< Tolerance value for comparing reference's output against implementation's output for 16-bit floating-point type */ } // namespace TEST_SUITE(GC) TEST_SUITE(PoolingLayer) +//clang-format off +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( + framework::dataset::make("InputInfo", +{ + TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0), // Mismatching data type + TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0), // Window shrink + TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0), // Invalid pad/size combination + TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0), // Invalid pad/size combination + TensorInfo(TensorShape(15U, 13U, 5U), 1, DataType::F32, 0), // Non-rectangular Global Pooling + TensorInfo(TensorShape(13U, 13U, 5U), 1, DataType::F32, 0), // Invalid output Global Pooling + TensorInfo(TensorShape(13U, 13U, 5U), 1, DataType::F32, 0), +}), +framework::dataset::make("OutputInfo", +{ + TensorInfo(TensorShape(25U, 11U, 2U), 1, DataType::F16, 0), TensorInfo(TensorShape(25U, 11U, 2U), 1, DataType::F32, 0), TensorInfo(TensorShape(30U, 11U, 2U), 1, DataType::F32, 0), TensorInfo(TensorShape(25U, 16U, 2U), 1, DataType::F32, 0), TensorInfo(TensorShape(1U, 1U, 5U), 1, DataType::F32, 0), TensorInfo(TensorShape(2U, 2U, 5U), 1, DataType::F32, 0), TensorInfo(TensorShape(1U, 1U, 5U), 1, DataType::F32, 0), +})), +framework::dataset::make("PoolInfo", +{ + PoolingLayerInfo(PoolingType::AVG, 3, PadStrideInfo(1, 1, 0, 0)), PoolingLayerInfo(PoolingType::AVG, 3, PadStrideInfo(1, 1, 0, 0)), PoolingLayerInfo(PoolingType::AVG, 3, PadStrideInfo(1, 1, 0, 0)), PoolingLayerInfo(PoolingType::AVG, 3, PadStrideInfo(1, 1, 0, 0)), PoolingLayerInfo(PoolingType::AVG, 2, PadStrideInfo(1, 1, 2, 0)), PoolingLayerInfo(PoolingType::AVG, 2, PadStrideInfo(1, 1, 0, 2)), PoolingLayerInfo(PoolingType::L2, 3, PadStrideInfo(1, 1, 0, 0)), PoolingLayerInfo(PoolingType::AVG), PoolingLayerInfo(PoolingType::MAX), PoolingLayerInfo(PoolingType::AVG), +})), +framework::dataset::make("Expected", { false, false, false, false, false, false, false, false, false, true })), +input_info, output_info, pool_info, expected) +{ + ARM_COMPUTE_EXPECT(bool(GCPoolingLayer::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false), pool_info)) == expected, framework::LogLevel::ERRORS); +} +//clang-format on + template using GCPoolingLayerFixture = PoolingLayerValidationFixture; @@ -67,33 +90,29 @@ TEST_SUITE(FP32) FIXTURE_DATA_TEST_CASE(RunSmall, GCPoolingLayerFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), combine(PoolingLayerDatasetFP, framework::dataset::make("DataType", DataType::F32)))) { - // FIXME(APPBROWSER-304): Add exclude padding support for OpenGL ES implementation // Validate output - // validate(GCAccessor(_target), _reference, tolerance_f32); + validate(GCAccessor(_target), _reference, tolerance_f32); } FIXTURE_DATA_TEST_CASE(RunLarge, GCPoolingLayerFixture, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), combine(PoolingLayerDatasetFP, framework::dataset::make("DataType", DataType::F32)))) { - // FIXME(APPBROWSER-304): Add exclude padding support for OpenGL ES implementation // Validate output - // validate(GCAccessor(_target), _reference, tolerance_f32); + validate(GCAccessor(_target), _reference, tolerance_f32); } TEST_SUITE_END() TEST_SUITE(FP16) -FIXTURE_DATA_TEST_CASE(RunSmall, GCPoolingLayerFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), combine(PoolingLayerDatasetFP, - framework::dataset::make("DataType", DataType::F16)))) +FIXTURE_DATA_TEST_CASE(RunSmall, GCPoolingLayerFixture, framework::DatasetMode::ALL, combine(datasets::SmallShapes(), combine(PoolingLayerDatasetFP, + framework::dataset::make("DataType", DataType::F16)))) { - // FIXME(APPBROWSER-304): Add exclude padding support for OpenGL ES implementation // Validate output - // validate(GCAccessor(_target), _reference, tolerance_f16); + validate(GCAccessor(_target), _reference, tolerance_f16); } -FIXTURE_DATA_TEST_CASE(RunLarge, GCPoolingLayerFixture, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), combine(PoolingLayerDatasetFP, - framework::dataset::make("DataType", DataType::F16)))) +FIXTURE_DATA_TEST_CASE(RunLarge, GCPoolingLayerFixture, framework::DatasetMode::NIGHTLY, combine(datasets::LargeShapes(), combine(PoolingLayerDatasetFP, + framework::dataset::make("DataType", DataType::F16)))) { - // FIXME(APPBROWSER-304): Add exclude padding support for OpenGL ES implementation // Validate output - // validate(GCAccessor(_target), _reference, tolerance_f16); + validate(GCAccessor(_target), _reference, tolerance_f16); } TEST_SUITE_END() TEST_SUITE_END() @@ -103,4 +122,3 @@ TEST_SUITE_END() } // namespace validation } // namespace test } // namespace arm_compute -#endif // 0 -- cgit v1.2.1