From 80943253e63779b61412264ff4c58b406cf061ae Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Thu, 10 Jan 2019 17:19:50 +0000 Subject: COMPMID-1652 CL Cleanup and add missing tests Change-Id: I359cc0fd0c3fa42ab10a770e59d58704403889b2 Reviewed-on: https://review.mlplatform.org/498 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Reviewed-by: Isabella Gottardi --- .../validation/CL/ConvertFullyConnectedWeights.cpp | 39 +++++++++++++++++++--- 1 file changed, 35 insertions(+), 4 deletions(-) (limited to 'tests/validation/CL/ConvertFullyConnectedWeights.cpp') diff --git a/tests/validation/CL/ConvertFullyConnectedWeights.cpp b/tests/validation/CL/ConvertFullyConnectedWeights.cpp index f67c447df7..ce51e41e63 100644 --- a/tests/validation/CL/ConvertFullyConnectedWeights.cpp +++ b/tests/validation/CL/ConvertFullyConnectedWeights.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -47,11 +47,42 @@ auto params = combine(framework::dataset::make("WeightsWidth", { 16, 32, 64 }), TEST_SUITE(CL) TEST_SUITE(ConvertFullyConnectedWeights) +// *INDENT-OFF* +// clang-format off +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 42U), 1, DataType::F32), // Mismatching data types + TensorInfo(TensorShape(32U, 42U), 1, DataType::F32), // Valid + TensorInfo(TensorShape(27U, 42U), 1, DataType::F32), // Mismatching shapes + TensorInfo(TensorShape(27U, 42U), 1, DataType::F32), // Wrong DataLayout + }), + framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(27U, 42U), 1, DataType::F16), + TensorInfo(TensorShape(32U, 42U), 1, DataType::F32), + TensorInfo(TensorShape(32U, 42U), 1, DataType::F32), + TensorInfo(TensorShape(32U, 42U), 1, DataType::F32), + })), + framework::dataset::make("OriginalInput", { TensorShape(7U, 3U, 2U), + TensorShape(7U, 3U, 2U), + TensorShape(7U, 3U, 2U), + TensorShape(7U, 3U, 2U), + })), + framework::dataset::make("DataLayout", { DataLayout::NCHW, + DataLayout::NCHW, + DataLayout::NCHW, + DataLayout::UNKNOWN, + })), + framework::dataset::make("Expected", { false, true, false, false})), + input_info, output_info, original_input_shape, data_layout, expected) +{ + bool is_valid = bool(CLConvertFullyConnectedWeights::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false), original_input_shape, data_layout)); + ARM_COMPUTE_EXPECT(is_valid == expected, framework::LogLevel::ERRORS); +} +// clang-format on +// *INDENT-ON* template using CLConvertFullyConnectedWeightsFixture = ConvertFullyConnectedWeightsValidationFixture; TEST_SUITE(FP32) -FIXTURE_DATA_TEST_CASE(RunSmall, CLConvertFullyConnectedWeightsFixture, framework::DatasetMode::ALL, combine(datasets::Small3DShapes(), combine(params, framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, CLConvertFullyConnectedWeightsFixture, framework::DatasetMode::ALL, combine(datasets::Tiny3DShapes(), combine(params, framework::dataset::make("DataType", DataType::F32)))) { // Validate output @@ -66,7 +97,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvertFullyConnectedWeightsFixture, f TEST_SUITE_END() TEST_SUITE(FP16) -FIXTURE_DATA_TEST_CASE(RunSmall, CLConvertFullyConnectedWeightsFixture, framework::DatasetMode::ALL, combine(datasets::Small3DShapes(), combine(params, framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, CLConvertFullyConnectedWeightsFixture, framework::DatasetMode::ALL, combine(datasets::Tiny3DShapes(), combine(params, framework::dataset::make("DataType", DataType::F16)))) { // Validate output @@ -81,7 +112,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvertFullyConnectedWeightsFixture, fr TEST_SUITE_END() TEST_SUITE(QASYMM8) -FIXTURE_DATA_TEST_CASE(RunSmall, CLConvertFullyConnectedWeightsFixture, framework::DatasetMode::ALL, combine(datasets::Small3DShapes(), combine(params, framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, CLConvertFullyConnectedWeightsFixture, framework::DatasetMode::ALL, combine(datasets::Tiny3DShapes(), combine(params, framework::dataset::make("DataType", DataType::QASYMM8)))) { // Validate output -- cgit v1.2.1