diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-07-16 14:40:09 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
commit | e29acf14f5c3f2d2c20799a1ea3e4aad50dff834 (patch) | |
tree | ca7a01ed169605404b2b954fc0d174ee00e121f2 /src/runtime/NEON | |
parent | 76259ca5a74a60ef2b80f29431ab53bbac9fdb63 (diff) | |
download | ComputeLibrary-e29acf14f5c3f2d2c20799a1ea3e4aad50dff834.tar.gz |
COMPMID-1365: Add support for NHWC in CLDepthConcatenateLayer
Change-Id: I3ed55bdb95d888aff0b0b76fb841bf1669659308
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/139963
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/runtime/NEON')
-rw-r--r-- | src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp b/src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp index 3d47ec2ac2..cb0157664b 100644 --- a/src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp +++ b/src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp @@ -28,6 +28,7 @@ #include "arm_compute/core/ITensor.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/Types.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "arm_compute/runtime/NEON/NEScheduler.h" #include "support/ToolchainSupport.h" @@ -49,7 +50,12 @@ void NEDepthConcatenateLayer::configure(std::vector<ITensor *> inputs_vector, IT _concat_kernels_vector = arm_compute::support::cpp14::make_unique<NEDepthConcatenateLayerKernel[]>(_num_inputs); _border_handlers_vector = arm_compute::support::cpp14::make_unique<NEFillBorderKernel[]>(_num_inputs); - TensorShape output_shape = calculate_depth_concatenate_shape(inputs_vector); + std::vector<ITensorInfo *> inputs_vector_info; + for(unsigned int i = 0; i < _num_inputs; i++) + { + inputs_vector_info.emplace_back(inputs_vector.at(i)->info()); + } + TensorShape output_shape = arm_compute::misc::shape_calculator::calculate_depth_concatenate_shape(inputs_vector_info); // Output auto inizialitation if not yet initialized auto_init_if_empty(*output->info(), output_shape, 1, inputs_vector[0]->info()->data_type()); |