diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-07-13 21:21:33 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-07-14 14:28:46 +0000 |
| commit | 4667dddc0ed403c636348294cd7f70261e5540cf (patch) | |
| tree | 177b74f377dcbb32cf8a83d407c633df255665a0 /tests/validation/fixtures/ConcatenateLayerFixture.h | |
| parent | 2232a201a9f72de483c12a7857c5f08b81cf7396 (diff) | |
| download | ComputeLibrary-4667dddc0ed403c636348294cd7f70261e5540cf.tar.gz | |
COMPMID-3374: Remove memory state from NEConcatenateLayer kernels
* Allow the following kernels to accept backing memory at run-time:
* NEBatchConcatenateLayerKernel
* NEDepthConcatenateLayerKernel
* NEHeightConcatenateLayerKernel
* NEWidthConcatenateLayerKernel
* Allow the following functions to accept backing memory at run-time:
* NEConcatenateLayer
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ib0b6714cff7f06a52dc74d294bc3e0d72a1c2419
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3569
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/validation/fixtures/ConcatenateLayerFixture.h')
| -rw-r--r-- | tests/validation/fixtures/ConcatenateLayerFixture.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/validation/fixtures/ConcatenateLayerFixture.h b/tests/validation/fixtures/ConcatenateLayerFixture.h index 9de59c27ba..a56eac1fdf 100644 --- a/tests/validation/fixtures/ConcatenateLayerFixture.h +++ b/tests/validation/fixtures/ConcatenateLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 Arm Limited. + * Copyright (c) 2018-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -46,6 +46,9 @@ namespace validation template <typename TensorType, typename ITensorType, typename AccessorType, typename FunctionType, typename T> class ConcatenateLayerValidationFixture : public framework::Fixture { +private: + using SrcITensorType = typename std::conditional<std::is_same<ITensorType, ITensor>::value, const ITensorType, ITensorType>::type; + public: template <typename...> void setup(TensorShape shape, DataType data_type, unsigned int axis) @@ -95,8 +98,8 @@ protected: TensorType compute_target(const std::vector<TensorShape> &shapes, const std::vector<QuantizationInfo> &qinfo, DataType data_type, unsigned int axis) { - std::vector<TensorType> srcs; - std::vector<ITensorType *> src_ptrs; + std::vector<TensorType> srcs; + std::vector<SrcITensorType *> src_ptrs; // Create tensors srcs.reserve(shapes.size()); |