diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-01-09 14:21:03 +0000 |
|---|---|---|
| committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-01-11 12:32:03 +0000 |
| commit | aeebe4ad332bc6dd4797243b39ec6000975429c5 (patch) | |
| tree | 68866e55aa29ad860ee9d222869b4add2551619b /tests/validation/NEON/ConvertFullyConnectedWeights.cpp | |
| parent | ee7c15d8a57b6e1a0a98edf2bb4693024d9c15dd (diff) | |
| download | ComputeLibrary-aeebe4ad332bc6dd4797243b39ec6000975429c5.tar.gz | |
COMPMID-1652 NEON Cleanup and add missing tests
Change-Id: I7b351f18a78ed8a250bf3a91ef320db61984146a
Reviewed-on: https://review.mlplatform.org/485
Reviewed-by: Isabella Gottardi <isabella.gottardi@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'tests/validation/NEON/ConvertFullyConnectedWeights.cpp')
| -rw-r--r-- | tests/validation/NEON/ConvertFullyConnectedWeights.cpp | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/tests/validation/NEON/ConvertFullyConnectedWeights.cpp b/tests/validation/NEON/ConvertFullyConnectedWeights.cpp index dbb81d6902..90509847ac 100644 --- a/tests/validation/NEON/ConvertFullyConnectedWeights.cpp +++ b/tests/validation/NEON/ConvertFullyConnectedWeights.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -47,6 +47,38 @@ auto params = combine(framework::dataset::make("WeightsWidth", { 16, 32, 64 }), TEST_SUITE(NEON) 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(NEConvertFullyConnectedWeights::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 <typename T> using NEConvertFullyConnectedWeightsFixture = ConvertFullyConnectedWeightsValidationFixture<Tensor, Accessor, NEConvertFullyConnectedWeights, T>; @@ -63,7 +95,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvertFullyConnectedWeightsFixture<float>, f // Validate output validate(Accessor(_target), _reference); } -TEST_SUITE_END() +TEST_SUITE_END() // FP32 #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC TEST_SUITE(FP16) @@ -79,8 +111,8 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvertFullyConnectedWeightsFixture<half>, fr // Validate output validate(Accessor(_target), _reference); } -TEST_SUITE_END() -#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ +TEST_SUITE_END() // FP16 +#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ TEST_SUITE(QASYMM8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvertFullyConnectedWeightsFixture<uint8_t>, framework::DatasetMode::ALL, combine(datasets::Small3DShapes(), combine(params, framework::dataset::make("DataType", @@ -96,10 +128,10 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvertFullyConnectedWeightsFixture<uint8_t>, // Validate output validate(Accessor(_target), _reference); } -TEST_SUITE_END() +TEST_SUITE_END() // QASYMM8 -TEST_SUITE_END() -TEST_SUITE_END() +TEST_SUITE_END() // ConvertFullyConnectedWeights +TEST_SUITE_END() // NEON } // namespace validation } // namespace test } // namespace arm_compute |