aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorManuel Bottini <manuel.bottini@arm.com>2019-10-18 10:37:46 +0000
committerManuel Bottini <manuel.bottini@arm.com>2019-10-18 12:19:50 +0000
commit34f88dd8569db6f682f56df277d44b80b22d0a3a (patch)
treed6063df39dcc7c0f473db91de97f1a163f42d5d1 /tests
parent662e5a45b05a4e3b00d5540dfc9f5ba8d769d627 (diff)
downloadComputeLibrary-34f88dd8569db6f682f56df277d44b80b22d0a3a.tar.gz
Revert "COMPMID-1816: Use parallel reduction on 0 axis in CL ARG_MIN/ARG_MAX"
This reverts commit 36debd4472839997fd3b6ec9d58530d95e3c17de. Change-Id: I45d63a63cebfd4582214b488027c2b14f492fdc1 Reviewed-on: https://review.mlplatform.org/c/2120 Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/benchmark/CL/ArgMinMax.cpp56
-rw-r--r--tests/benchmark/fixtures/ArgMinMaxFixture.h84
2 files changed, 0 insertions, 140 deletions
diff --git a/tests/benchmark/CL/ArgMinMax.cpp b/tests/benchmark/CL/ArgMinMax.cpp
deleted file mode 100644
index 25a4a05d44..0000000000
--- a/tests/benchmark/CL/ArgMinMax.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2019 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/CLArgMinMaxLayer.h"
-
-#include "tests/CL/CLAccessor.h"
-#include "tests/benchmark/fixtures/ArgMinMaxFixture.h"
-#include "tests/datasets/ShapeDatasets.h"
-#include "tests/datasets/SplitDataset.h"
-#include "tests/framework/Asserts.h"
-#include "tests/framework/Macros.h"
-
-namespace arm_compute
-{
-namespace test
-{
-namespace benchmark
-{
-TEST_SUITE(CL)
-
-using CLArgMinMaxBenchmarkFixture = ArgMinMaxBenchmarkFixture<CLTensor, CLArgMinMaxLayer, CLAccessor>;
-
-REGISTER_FIXTURE_DATA_TEST_CASE(ArgMinMax, CLArgMinMaxBenchmarkFixture, framework::DatasetMode::PRECOMMIT,
- framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(
- datasets::Large3DShapes(),
- framework::dataset::make("DataType", { DataType::F32 })),
- framework::dataset::make("Axis", { 0, 1 })),
- framework::dataset::make("ReductionOperation", { ReductionOperation::ARG_IDX_MAX, ReductionOperation::ARG_IDX_MIN })));
-
-TEST_SUITE_END() // CL
-} // namespace benchmark
-} // namespace test
-} // namespace arm_compute
diff --git a/tests/benchmark/fixtures/ArgMinMaxFixture.h b/tests/benchmark/fixtures/ArgMinMaxFixture.h
deleted file mode 100644
index f1a0c5ab4b..0000000000
--- a/tests/benchmark/fixtures/ArgMinMaxFixture.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2019 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_ARGMINMAXFIXTURE
-#define ARM_COMPUTE_TEST_ARGMINMAXFIXTURE
-
-#include "arm_compute/core/TensorShape.h"
-#include "arm_compute/core/Types.h"
-#include "tests/Globals.h"
-#include "tests/Utils.h"
-#include "tests/framework/Fixture.h"
-
-namespace arm_compute
-{
-namespace test
-{
-namespace benchmark
-{
-/** Fixture that can be used for NEON and CL */
-template <typename TensorType, typename Function, typename Accessor>
-class ArgMinMaxBenchmarkFixture : public framework::Fixture
-{
-public:
- template <typename...>
- void setup(TensorShape shape, DataType data_type, int axis, ReductionOperation op)
- {
- // Create tensors
- src = create_tensor<TensorType>(shape, data_type);
- dst = create_tensor<TensorType>(shape, DataType::U32);
-
- // Create and configure function
- argminmax_layer.configure(&src, axis, &dst, op);
-
- // Allocate tensors
- src.allocator()->allocate();
- dst.allocator()->allocate();
- }
-
- void run()
- {
- argminmax_layer.run();
- }
-
- void sync()
- {
- sync_if_necessary<TensorType>();
- sync_tensor_if_necessary<TensorType>(dst);
- }
-
- void teardown()
- {
- src.allocator()->free();
- dst.allocator()->free();
- }
-
-private:
- TensorType src{};
- TensorType dst{};
- Function argminmax_layer{};
-};
-} // namespace benchmark
-} // namespace test
-} // namespace arm_compute
-#endif /* ARM_COMPUTE_TEST_ARGMINMAXFIXTURE */