diff options
| author | Vidhya Sudhan Loganathan <vidhyasudhan.loganathan@arm.com> | 2019-06-28 14:09:53 +0100 |
|---|---|---|
| committer | VidhyaSudhan Loganathan <vidhyasudhan.loganathan@arm.com> | 2019-06-28 14:15:30 +0000 |
| commit | 338595bca8ab60492f10626860acb1ab3722b1ce (patch) | |
| tree | 03504ec3a2973e30c80f9bf56b77b4a4c7c9d83c /src/runtime | |
| parent | 7026b303d636e7639f8877ae8d5eff54f39c1121 (diff) | |
| download | ComputeLibrary-338595bca8ab60492f10626860acb1ab3722b1ce.tar.gz | |
COMPMID-2234 : Add support for axis 3 in NE/CLConcatenateLayer
Change-Id: Ic86f89ece3afe72809bc69c6de6fee7d21daa1d4
Signed-off-by: Vidhya Sudhan Loganathan <vidhyasudhan.loganathan@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1440
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/CL/functions/CLConcatenateLayer.cpp | 21 | ||||
| -rw-r--r-- | src/runtime/NEON/functions/NEConcatenateLayer.cpp | 13 |
2 files changed, 34 insertions, 0 deletions
diff --git a/src/runtime/CL/functions/CLConcatenateLayer.cpp b/src/runtime/CL/functions/CLConcatenateLayer.cpp index 0594a17a7a..1d396f5ebf 100644 --- a/src/runtime/CL/functions/CLConcatenateLayer.cpp +++ b/src/runtime/CL/functions/CLConcatenateLayer.cpp @@ -23,6 +23,7 @@ */ #include "arm_compute/runtime/CL/functions/CLConcatenateLayer.h" +#include "arm_compute/core/CL/kernels/CLBatchConcatenateLayerKernel.h" #include "arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h" #include "arm_compute/core/CL/kernels/CLHeightConcatenateLayerKernel.h" #include "arm_compute/core/CL/kernels/CLWidthConcatenate2TensorsKernel.h" @@ -124,6 +125,17 @@ void CLConcatenateLayer::configure(const std::vector<ICLTensor *> &inputs_vector } break; } + case 3: + { + for(unsigned int i = 0; i < _num_inputs; ++i) + { + auto kernel = support::cpp14::make_unique<CLBatchConcatenateLayerKernel>(); + kernel->configure(inputs_vector.at(i), offset, output); + offset += inputs_vector.at(i)->info()->dimension(_axis); + _concat_kernels.emplace_back(std::move(kernel)); + } + break; + } default: ARM_COMPUTE_ERROR("Axis not supported"); } @@ -184,6 +196,15 @@ Status CLConcatenateLayer::validate(const std::vector<ITensorInfo *> &inputs_vec } break; } + case 3: + { + for(const auto &input : inputs_vector) + { + ARM_COMPUTE_RETURN_ON_ERROR(CLBatchConcatenateLayerKernel::validate(input, offset, output)); + offset += input->dimension(axis); + } + break; + } default: ARM_COMPUTE_ERROR("Axis not supported"); } diff --git a/src/runtime/NEON/functions/NEConcatenateLayer.cpp b/src/runtime/NEON/functions/NEConcatenateLayer.cpp index d338493e51..9a70d32843 100644 --- a/src/runtime/NEON/functions/NEConcatenateLayer.cpp +++ b/src/runtime/NEON/functions/NEConcatenateLayer.cpp @@ -23,6 +23,7 @@ */ #include "arm_compute/runtime/NEON/functions/NEConcatenateLayer.h" +#include "arm_compute/core/NEON/kernels/NEBatchConcatenateLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEHeightConcatenateLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEWidthConcatenateLayerKernel.h" @@ -112,6 +113,13 @@ void NEConcatenateLayer::configure_internal(std::vector<TensorType *> &&inputs_v _concat_kernels.emplace_back(std::move(kernel)); break; } + case 3: + { + auto kernel = support::cpp14::make_unique<NEBatchConcatenateLayerKernel>(); + kernel->configure(inputs_vector.at(i), offset, output); + _concat_kernels.emplace_back(std::move(kernel)); + break; + } default: ARM_COMPUTE_ERROR("Axis not supported"); } @@ -146,6 +154,11 @@ Status NEConcatenateLayer::validate_internal(const std::vector<TensorInfoType *> ARM_COMPUTE_RETURN_ON_ERROR(NEDepthConcatenateLayerKernel::validate(input, offset, output)); break; } + case 3: + { + ARM_COMPUTE_RETURN_ON_ERROR(NEBatchConcatenateLayerKernel::validate(input, offset, output)); + break; + } default: ARM_COMPUTE_ERROR("Axis not supported"); } |