From 7900a9efa421f0ac8faf9bb939f5c536b42c62b0 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 23 Nov 2018 11:44:58 +0000 Subject: COMPMID-1716: CL Comparison operations Adds support for Equal,NotEqual,Less,LessEqual,Greater,GreaterEqual Change-Id: If0cdf4aae7f95c94709b195eee485f6663f45909 --- tests/datasets/BorderModeDataset.h | 9 +---- tests/datasets/ComparisonOperationsDataset.h | 57 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 tests/datasets/ComparisonOperationsDataset.h (limited to 'tests/datasets') diff --git a/tests/datasets/BorderModeDataset.h b/tests/datasets/BorderModeDataset.h index 3b8a08ce61..78df2cc85f 100644 --- a/tests/datasets/BorderModeDataset.h +++ b/tests/datasets/BorderModeDataset.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -29,13 +29,6 @@ #include "utils/TypePrinter.h" -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include - namespace arm_compute { namespace test diff --git a/tests/datasets/ComparisonOperationsDataset.h b/tests/datasets/ComparisonOperationsDataset.h new file mode 100644 index 0000000000..ff70418eb3 --- /dev/null +++ b/tests/datasets/ComparisonOperationsDataset.h @@ -0,0 +1,57 @@ +/* + * 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_COMPARISON_OPERATIONS_DATASET_H__ +#define __ARM_COMPUTE_TEST_COMPARISON_OPERATIONS_DATASET_H__ + +#include "arm_compute/core/Types.h" +#include "tests/framework/datasets/ContainerDataset.h" + +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace datasets +{ +class ComparisonOperations final : public framework::dataset::ContainerDataset> +{ +public: + ComparisonOperations() + : ContainerDataset("ComparisonOperation", + { + ComparisonOperation::Equal, + ComparisonOperation::NotEqual, + ComparisonOperation::Greater, + ComparisonOperation::GreaterEqual, + ComparisonOperation::Less, + ComparisonOperation::LessEqual + }) + { + } +}; +} // namespace datasets +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_COMPARISON_OPERATIONS_DATASET_H__ */ -- cgit v1.2.1