diff options
author | Kurtis Charnock <kurtis.charnock@arm.com> | 2019-11-29 11:42:30 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-01-13 17:43:02 +0000 |
commit | ec00da149b7884114cd6c43cc9c1cff62ddaa710 (patch) | |
tree | ef02ea4d3c5b45178606f40cbea6af6b33005d6f /tests/validation/CL/Split.cpp | |
parent | 6f314db14f0fd242d53f3a9f780158169259b31b (diff) | |
download | ComputeLibrary-ec00da149b7884114cd6c43cc9c1cff62ddaa710.tar.gz |
COMPMID-2728: Add support for split sizes in CLSplit
Signed-off-by: Kurtis Charnock <kurtis.charnock@arm.com>
Change-Id: I69ea9e812478904c3e10379bb5943d534c45f942
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/214132
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2432
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'tests/validation/CL/Split.cpp')
-rw-r--r-- | tests/validation/CL/Split.cpp | 73 |
1 files changed, 72 insertions, 1 deletions
diff --git a/tests/validation/CL/Split.cpp b/tests/validation/CL/Split.cpp index e038b89856..8f55b4250f 100644 --- a/tests/validation/CL/Split.cpp +++ b/tests/validation/CL/Split.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -65,6 +65,29 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( const Status status = CLSplit::validate(&input_info.clone()->set_is_resizable(false), outputs_info_ptr, axis); ARM_COMPUTE_EXPECT(bool(status) == expected, framework::LogLevel::ERRORS); } + +DATA_TEST_CASE(ValidateSplitShapes, framework::DatasetMode::ALL, zip(zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 3U, 16U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 3U, 16U, 2U), 1, DataType::F32) + }), + framework::dataset::make("Axis", { 2, 2 })), + framework::dataset::make("Splits", { std::vector<TensorInfo>{TensorInfo(TensorShape(27U, 3U, 4U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 3U, 4U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 3U, 8U, 2U), 1, DataType::F32)}, + std::vector<TensorInfo>{TensorInfo(TensorShape(27U, 3U, 3U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 3U, 13U, 2U), 1, DataType::F32)} })), + framework::dataset::make("Expected", { true, true })), + input_info, axis, splits, expected) +{ + std::vector<ITensorInfo*> outputs_info_ptr; + + for(auto &split : splits) + { + outputs_info_ptr.emplace_back(const_cast<TensorInfo*>(&split)); + } + const Status status = CLSplit::validate(&input_info.clone()->set_is_resizable(false), outputs_info_ptr, axis); + ARM_COMPUTE_EXPECT(bool(status) == expected, framework::LogLevel::ERRORS); +} // clang-format on // *INDENT-ON* @@ -95,9 +118,45 @@ DATA_TEST_CASE(Configuration, } } +DATA_TEST_CASE(ConfigurationSplitShapes, + framework::DatasetMode::ALL, + combine(datasets::SmallSplitShapesDataset(), framework::dataset::make("DataType", { DataType::F16, DataType::F32 })), + shape, axis, split_shapes, data_type) +{ + // Create tensors + CLTensor src = create_tensor<CLTensor>(shape, data_type); + std::vector<CLTensor> dsts; + + for(const auto &split_shape : split_shapes) + { + CLTensor dst = create_tensor<CLTensor>(split_shape, data_type); + dsts.push_back(std::move(dst)); + } + + std::vector<ICLTensor *> dsts_ptrs; + for(auto &dst : dsts) + { + dsts_ptrs.emplace_back(&dst); + } + + // Create and Configure function + CLSplit split; + split.configure(&src, dsts_ptrs, axis); + + // Validate valid regions + for(auto &dst : dsts) + { + const ValidRegion valid_region = shape_to_valid_region(dst.info()->tensor_shape()); + validate(dst.info()->valid_region(), valid_region); + } +} + template <typename T> using CLSplitFixture = SplitFixture<CLTensor, ICLTensor, CLAccessor, CLSplit, T>; +template <typename T> +using CLSplitShapesFixture = SplitShapesFixture<CLTensor, ICLTensor, CLAccessor, CLSplit, T>; + TEST_SUITE(Float) TEST_SUITE(FP16) FIXTURE_DATA_TEST_CASE(RunSmall, @@ -149,6 +208,18 @@ FIXTURE_DATA_TEST_CASE(RunLarge, validate(CLAccessor(_target[i]), _reference[i]); } } + +FIXTURE_DATA_TEST_CASE(RunSmallSplitShapes, + CLSplitShapesFixture<float>, + framework::DatasetMode::PRECOMMIT, + combine(datasets::SmallSplitShapesDataset(), framework::dataset::make("DataType", DataType::F32))) +{ + // Validate outputs + for(unsigned int i = 0; i < _target.size(); ++i) + { + validate(CLAccessor(_target[i]), _reference[i]); + } +} TEST_SUITE_END() // FP32 TEST_SUITE_END() // Float |