From 5e96be7707a571b136dc64256af399dbbb0fdfe0 Mon Sep 17 00:00:00 2001 From: Vidhya Sudhan Loganathan Date: Tue, 18 Dec 2018 14:17:00 +0000 Subject: COMPMID-1722 : CL: Implement Range Change-Id: I88da6eb5289c303b1dc91606c1560ce629746058 Reviewed-on: https://review.mlplatform.org/381 Reviewed-by: Gian Marco Iodice Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas --- tests/validation/CL/Range.cpp | 162 +++++++++++++++++++++++++++++++ tests/validation/fixtures/RangeFixture.h | 140 ++++++++++++++++++++++++++ tests/validation/reference/Range.cpp | 77 +++++++++++++++ tests/validation/reference/Range.h | 45 +++++++++ 4 files changed, 424 insertions(+) create mode 100644 tests/validation/CL/Range.cpp create mode 100644 tests/validation/fixtures/RangeFixture.h create mode 100644 tests/validation/reference/Range.cpp create mode 100644 tests/validation/reference/Range.h (limited to 'tests') diff --git a/tests/validation/CL/Range.cpp b/tests/validation/CL/Range.cpp new file mode 100644 index 0000000000..b1804f2184 --- /dev/null +++ b/tests/validation/CL/Range.cpp @@ -0,0 +1,162 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/CLTensorAllocator.h" +#include "arm_compute/runtime/CL/functions/CLRange.h" +#include "tests/CL/CLAccessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/ConvertPolicyDataset.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/RangeFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +constexpr RelativeTolerance tolerance(0.01f); +constexpr AbsoluteTolerance abs_tolerance(0.02f); +const auto start_dataset = framework::dataset::make("Start", { float(3), float(-17), float(16) }); +const auto unsigned_start_dataset = framework::dataset::make("Start", { float(3), float(16) }); +const auto float_step_dataset = framework::dataset::make("Step", { float(1), float(-0.2f), float(0.2), float(12.2), float(-12.2), float(-1.2), float(-3), float(3) }); +const auto step_dataset = framework::dataset::make("Step", { float(1), float(12), float(-12), float(-1), float(-3), float(3) }); +const auto unsigned_step_dataset = framework::dataset::make("Step", { float(1), float(12), float(3) }); +} // namespace + +TEST_SUITE(CL) +TEST_SUITE(Range) + +// *INDENT-OFF* +// clang-format off + +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip( + framework::dataset::make("OutputInfo", { TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(32U), 1, DataType::U8), + TensorInfo(TensorShape(27U), 1, DataType::U8), + TensorInfo(TensorShape(32U), 1, DataType::U8), + TensorInfo(TensorShape(32U), 1, DataType::F32), + TensorInfo(TensorShape(27U), 1, DataType::U8), + TensorInfo(TensorShape(27U), 1, DataType::U8), + TensorInfo(TensorShape(10U), 1, DataType::U8), + }), + framework::dataset::make("Start",{ 0.0f, 15.0f, 1500.0f, 100.0f, -15.0f, 0.2f , 2.0f , 10.0f})), + framework::dataset::make("End",{ 100.0f, 15.0f, 2500.0f, -1000.0f, 15.0f, 10.0f, 10.0f,100.0f })), + framework::dataset::make("Step",{ 100.0f, 15.0f, 10.0f, 100.0f, -15.0f, 1.0f, 0.0f, 10.0f })), + framework::dataset::make("Expected", { false, //1-D tensor expected + false, //start == end + false, //output vector size insufficient + false, //sign of step incorrect + false, //sign of step incorrect + false, //data type incompatible + false, //step = 0 + true, + })), + output_info, start, end, step, expected) +{ + ARM_COMPUTE_EXPECT(bool(CLRange::validate(&output_info, start, end, step)) == expected, framework::LogLevel::ERRORS); +} +// clang-format on +// *INDENT-ON* + +template +using CLRangeFixture = RangeFixture; + +TEST_SUITE(U8) +FIXTURE_DATA_TEST_CASE(RunSmall, CLRangeFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine( + framework::dataset::make("DataType", DataType::U8), + unsigned_start_dataset), + unsigned_step_dataset), + framework::dataset::make("QuantizationInfo", { QuantizationInfo() }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance, 0.f, abs_tolerance); +} +TEST_SUITE_END() //U8 + +TEST_SUITE(Quantized) +TEST_SUITE(QASYMM8) + +FIXTURE_DATA_TEST_CASE(RunSmall, CLRangeFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine( + framework::dataset::make("DataType", DataType::QASYMM8), + start_dataset), + step_dataset), + framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.3457f, 120.0f) }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance, 0.f, abs_tolerance); +} +TEST_SUITE_END() //QASYMM8 +TEST_SUITE_END() //Quantized + +TEST_SUITE(S16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLRangeFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine( + framework::dataset::make("DataType", DataType::S16), + start_dataset), + step_dataset), + framework::dataset::make("QuantizationInfo", { QuantizationInfo() }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance, 0.f, abs_tolerance); +} +TEST_SUITE_END() //S16 + +TEST_SUITE(Float) +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLRangeFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine( + framework::dataset::make("DataType", DataType::F16), + start_dataset), + float_step_dataset), + framework::dataset::make("QuantizationInfo", { QuantizationInfo() }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance, 0.f, abs_tolerance); +} +TEST_SUITE_END() //FP16 + +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLRangeFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine( + framework::dataset::make("DataType", DataType::F32), + start_dataset), + float_step_dataset), + framework::dataset::make("QuantizationInfo", { QuantizationInfo() }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance, 0.f, abs_tolerance); +} +TEST_SUITE_END() //FP32 +TEST_SUITE_END() //Float + +TEST_SUITE_END() //Range +TEST_SUITE_END() //CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/RangeFixture.h b/tests/validation/fixtures/RangeFixture.h new file mode 100644 index 0000000000..c192eee14f --- /dev/null +++ b/tests/validation/fixtures/RangeFixture.h @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ARM_COMPUTE_TEST_RANGE_FIXTURE +#define ARM_COMPUTE_TEST_RANGE_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" +#include "tests/validation/Helpers.h" +#include "tests/validation/reference/Range.h" + +#include + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +size_t num_of_elements_in_range(float start, float end, float step) +{ + ARM_COMPUTE_ERROR_ON(step == 0); + return size_t(std::ceil((end - start) / step)); +} +} + +template +class RangeFixture : public framework::Fixture +{ +public: + template + void setup(const DataType data_type0, float start, float step, const QuantizationInfo qinfo0 = QuantizationInfo()) + { + _target = compute_target(data_type0, qinfo0, start, step); + _reference = compute_reference(data_type0, qinfo0, start, step); + } + +protected: + float get_random_end(const DataType output_data_type, const QuantizationInfo qinfo_out, float start, float step) + { + std::uniform_real_distribution<> distribution(1, 100); + std::mt19937 gen(library->seed()); + float end = start; + switch(output_data_type) + { + case DataType::U8: + end += std::max((uint8_t)1, static_cast(distribution(gen))) * step; + return utility::clamp(end); + case DataType::U16: + end += std::max((uint16_t)1, static_cast(distribution(gen))) * step; + return utility::clamp(end); + case DataType::U32: + end += std::max((uint32_t)1, static_cast(distribution(gen))) * step; + return utility::clamp(end); + case DataType::S8: + end += std::max((int8_t)1, static_cast(distribution(gen))) * step; + return utility::clamp(end); + case DataType::S16: + end += std::max((int16_t)1, static_cast(distribution(gen))) * step; + return utility::clamp(end); + case DataType::S32: + end += std::max((int32_t)1, static_cast(distribution(gen))) * step; + return utility::clamp(end); + case DataType::F32: + end += std::max(1.0f, static_cast(distribution(gen))) * step; + return end; + case DataType::F16: + end += std::max(half(1.0f), static_cast(distribution(gen))) * step; + return utility::clamp(end); + case DataType::QASYMM8: + return utility::clamp(end + (float)distribution(gen) * step, qinfo_out.dequantize(0), qinfo_out.dequantize(std::numeric_limits::max())); + default: + return 0; + } + } + + TensorType compute_target(const DataType output_data_type, const QuantizationInfo qinfo_out, float start, float step) + { + float end = get_random_end(output_data_type, qinfo_out, start, step); + size_t num_of_elements = num_of_elements_in_range(start, end, step); + // Create tensor + TensorType dst = create_tensor(TensorShape(num_of_elements), output_data_type, 1, qinfo_out); + // Create and configure function + FunctionType range_func; + range_func.configure(&dst, start, end, step); + + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + // Allocate tensors + dst.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Compute function + range_func.run(); + return dst; + } + + SimpleTensor compute_reference(const DataType output_data_type, const QuantizationInfo qinfo_out, float start, float step) + { + // Create tensor + const float end = get_random_end(output_data_type, qinfo_out, start, step); + size_t num_of_elements = num_of_elements_in_range(start, end, step); + SimpleTensor ref_dst{ TensorShape(num_of_elements ? num_of_elements : 1), output_data_type, 1, qinfo_out }; + return reference::range(ref_dst, start, num_of_elements, step); + } + + TensorType _target{}; + SimpleTensor _reference{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_RANGE_FIXTURE */ diff --git a/tests/validation/reference/Range.cpp b/tests/validation/reference/Range.cpp new file mode 100644 index 0000000000..c24512fa9d --- /dev/null +++ b/tests/validation/reference/Range.cpp @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/core/Types.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +namespace +{ +template +void generate_range(SimpleTensor &dst, float start, const size_t num_of_elements, float step) +{ + float val = start; + for(size_t index = 0; index < num_of_elements; index++) + { + dst[index] = static_cast(val); + val += step; + } +} +} // namespace + +template +SimpleTensor range(SimpleTensor &dst, float start, const size_t num_of_elements, float step) +{ + generate_range(dst, start, num_of_elements, step); + return dst; +} + +template <> +SimpleTensor range(SimpleTensor &dst, float start, const size_t num_of_elements, float step) +{ + if(dst.data_type() == DataType::QASYMM8) + { + SimpleTensor dst_tmp{ dst.shape(), DataType::F32, 1 }; + generate_range(dst_tmp, start, num_of_elements, step); + return convert_to_asymmetric(dst_tmp, dst.quantization_info()); + } + generate_range(dst, start, num_of_elements, step); + return dst; +} +template SimpleTensor range(SimpleTensor &dst, float start, const size_t num_of_elements, float step); +template SimpleTensor range(SimpleTensor &dst, float start, const size_t num_of_elements, float step); +template SimpleTensor range(SimpleTensor &dst, float start, const size_t num_of_elements, float step); +template SimpleTensor range(SimpleTensor &dst, float start, const size_t num_of_elements, float step); +template SimpleTensor range(SimpleTensor &dst, float start, const size_t num_of_elements, float step); + +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/Range.h b/tests/validation/reference/Range.h new file mode 100644 index 0000000000..d31166bb86 --- /dev/null +++ b/tests/validation/reference/Range.h @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_TEST_RANGE_H__ +#define __ARM_COMPUTE_TEST_RANGE_H__ + +#include "tests/SimpleTensor.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor range(SimpleTensor &dst, float start, size_t num_elements, float step); + +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_RANGE_H__ */ -- cgit v1.2.1