diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-05-17 18:14:40 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-05-21 11:28:01 +0000 |
| commit | 09f24975437e2e141ba51a07055a9372b0d173a2 (patch) | |
| tree | fe565e4b9abd379cb1f467e5d9e36d68fcfbacef /tests/benchmark | |
| parent | f24411ffc842970609a1fb6ba2f9527cfb681dbd (diff) | |
| download | ComputeLibrary-09f24975437e2e141ba51a07055a9372b0d173a2.tar.gz | |
COMPMID-2109: Remove CL/NE Width/Depth ConcatenateLayer functions.
Change-Id: Icbda771abffbb45d4ed0958933c60ff9ace01314
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1178
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/benchmark')
| -rw-r--r-- | tests/benchmark/CL/DepthConcatenateLayer.cpp | 6 | ||||
| -rw-r--r-- | tests/benchmark/NEON/DepthConcatenateLayer.cpp | 4 | ||||
| -rw-r--r-- | tests/benchmark/fixtures/DepthConcatenateLayerFixture.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/benchmark/CL/DepthConcatenateLayer.cpp b/tests/benchmark/CL/DepthConcatenateLayer.cpp index 3a5c457135..9b101d84ed 100644 --- a/tests/benchmark/CL/DepthConcatenateLayer.cpp +++ b/tests/benchmark/CL/DepthConcatenateLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ #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/CLDepthConcatenateLayer.h" +#include "arm_compute/runtime/CL/functions/CLConcatenateLayer.h" #include "tests/CL/CLAccessor.h" #include "tests/benchmark/fixtures/DepthConcatenateLayerFixture.h" #include "tests/datasets/ShapeDatasets.h" @@ -44,7 +44,7 @@ namespace const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); } // namespace -using CLDepthConcatenateLayerFixture = DepthConcatenateLayerFixture<CLTensor, ICLTensor, CLDepthConcatenateLayer, CLAccessor>; +using CLDepthConcatenateLayerFixture = DepthConcatenateLayerFixture<CLTensor, ICLTensor, CLConcatenateLayer, CLAccessor>; TEST_SUITE(CL) TEST_SUITE(DepthConcatenateLayer) diff --git a/tests/benchmark/NEON/DepthConcatenateLayer.cpp b/tests/benchmark/NEON/DepthConcatenateLayer.cpp index b82da24999..1d8b18c2bb 100644 --- a/tests/benchmark/NEON/DepthConcatenateLayer.cpp +++ b/tests/benchmark/NEON/DepthConcatenateLayer.cpp @@ -23,7 +23,7 @@ */ #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h" +#include "arm_compute/runtime/NEON/functions/NEConcatenateLayer.h" #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" @@ -44,7 +44,7 @@ namespace const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); } // namespace -using NEDepthConcatenateLayerFixture = DepthConcatenateLayerFixture<Tensor, ITensor, NEDepthConcatenateLayer, Accessor>; +using NEDepthConcatenateLayerFixture = DepthConcatenateLayerFixture<Tensor, ITensor, NEConcatenateLayer, Accessor>; TEST_SUITE(NEON) TEST_SUITE(DepthConcatenateLayer) diff --git a/tests/benchmark/fixtures/DepthConcatenateLayerFixture.h b/tests/benchmark/fixtures/DepthConcatenateLayerFixture.h index 541dfb285c..272da38952 100644 --- a/tests/benchmark/fixtures/DepthConcatenateLayerFixture.h +++ b/tests/benchmark/fixtures/DepthConcatenateLayerFixture.h @@ -86,7 +86,7 @@ public: TensorShape dst_shape = misc::shape_calculator::calculate_concatenate_shape(src_ptrs, Window::DimZ); _dst = create_tensor<TensorType>(dst_shape, data_type, 1); - _depth_concat.configure(src_ptrs, &_dst); + _depth_concat.configure(src_ptrs, &_dst, 2); for(auto &src : _srcs) { |