diff options
Diffstat (limited to 'src/runtime/CL/functions/CLFlattenLayer.cpp')
| -rw-r--r-- | src/runtime/CL/functions/CLFlattenLayer.cpp | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/runtime/CL/functions/CLFlattenLayer.cpp b/src/runtime/CL/functions/CLFlattenLayer.cpp index c10e91bf96..b2860ea24a 100644 --- a/src/runtime/CL/functions/CLFlattenLayer.cpp +++ b/src/runtime/CL/functions/CLFlattenLayer.cpp @@ -23,11 +23,16 @@ */ #include "arm_compute/runtime/CL/functions/CLFlattenLayer.h" +#include "arm_compute/core/CL/CLKernelLibrary.h" +#include "arm_compute/core/CL/ICLTensor.h" +#include "arm_compute/core/TensorInfo.h" +#include "arm_compute/core/Validate.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "arm_compute/runtime/CL/CLScheduler.h" -#include "src/core/CL/kernels/CLFlattenLayerKernel.h" - -using namespace arm_compute; +#include "src/core/helpers/AutoConfiguration.h" +namespace arm_compute +{ void CLFlattenLayer::configure(const ICLTensor *input, ICLTensor *output) { configure(CLKernelLibrary::get().get_compile_context(), input, output); @@ -35,13 +40,24 @@ void CLFlattenLayer::configure(const ICLTensor *input, ICLTensor *output) void CLFlattenLayer::configure(const CLCompileContext &compile_context, const ICLTensor *input, ICLTensor *output) { - auto k = std::make_unique<CLFlattenLayerKernel>(); - k->configure(compile_context, input, output); - _kernel = std::move(k); - CLScheduler::get().tune_kernel_static(*_kernel); + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); + auto_init_if_empty(*output->info(), input->info()->clone()->set_tensor_shape(misc::shape_calculator::compute_flatten_shape(input->info()))); + _reshape.configure(compile_context, input, output); } Status CLFlattenLayer::validate(const ITensorInfo *input, const ITensorInfo *output) { - return CLFlattenLayerKernel::validate(input, output); + // Checks performed when output is configured + if(output->total_size() != 0) + { + const TensorInfo tensor_info_output = input->clone()->set_tensor_shape(misc::shape_calculator::compute_flatten_shape(input)); + ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_SHAPES(output, &tensor_info_output); + } + return CLReshapeLayer::validate(input, output); +} + +void CLFlattenLayer::run() +{ + _reshape.run(); } +} // namespace arm_compute
\ No newline at end of file |