From 7c23ad01c028f73aef0b439fc5d5d14e92e5f4e2 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Thu, 30 Nov 2017 15:08:38 +0000 Subject: COMPMID-617 Add validation to NEConvolutionLayer Change-Id: I796a13e6ea672e274aaa8234ee0689828fec7292 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/111348 Tested-by: Jenkins Reviewed-by: Ioan-Cristian Szabo Reviewed-by: Anthony Barbier --- .../NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp | 106 +++++++++++++-------- 1 file changed, 68 insertions(+), 38 deletions(-) (limited to 'src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp') diff --git a/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp b/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp index a583c1dfd4..aa5e2dd0dd 100644 --- a/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp +++ b/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp @@ -1408,36 +1408,36 @@ void matrix_matrix_multiply_qs16(const ITensor *input0, const ITensor *input1, I }, ina, inb, out); } -} // namespace - -NEGEMMMatrixMultiplyKernel::NEGEMMMatrixMultiplyKernel() - : _input0(nullptr), _input1(nullptr), _output(nullptr), _alpha(1.0f) -{ -} -void NEGEMMMatrixMultiplyKernel::configure(const ITensor *input0, const ITensor *input1, ITensor *output, float alpha) +Status validate_arguments(const ITensorInfo *input0, const ITensorInfo *input1, const ITensorInfo *output) { - ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input0, 1, DataType::F16, DataType::F32, DataType::QS8, DataType::QS16); - ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input0, input1, output); - ARM_COMPUTE_ERROR_ON_MISMATCHING_FIXED_POINT(input0, input1, output); + ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input0, 1, DataType::F16, DataType::F32, DataType::QS8, DataType::QS16); + ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input0, input1, output); + ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_FIXED_POINT(input0, input1, output); + ARM_COMPUTE_UNUSED(input0); + ARM_COMPUTE_UNUSED(input1); + ARM_COMPUTE_UNUSED(output); - if(output->info()->dimension(1) == 1) + if(output->dimension(1) == 1) { - ARM_COMPUTE_ERROR_ON(input0->info()->dimension(0) != input1->info()->dimension(1)); + ARM_COMPUTE_RETURN_ERROR_ON(input0->dimension(0) != input1->dimension(1)); } - _input0 = input0; - _input1 = input1; - _output = output; - _alpha = alpha; + return Status{}; +} + +std::pair validate_and_configure_window(ITensorInfo *input0, ITensorInfo *input1, ITensorInfo *output) +{ + Window win = Window(); + bool window_changed = false; unsigned int num_elems_processed_per_iteration_x = 0; const unsigned int num_elems_processed_per_iteration_y = 4; // Check if the output tensor is a vector. If so,the kernel runs the vector-matrix multiplication - if((output->info()->dimension(1) == 1)) + if((output->dimension(1) == 1)) { - switch(input0->info()->data_type()) + switch(input0->data_type()) { case DataType::F32: { @@ -1469,24 +1469,22 @@ void NEGEMMMatrixMultiplyKernel::configure(const ITensor *input0, const ITensor } // Configure kernel window - Window win = calculate_max_window(*output->info(), Steps(num_elems_processed_per_iteration_x)); + win = calculate_max_window(*output, Steps(num_elems_processed_per_iteration_x)); - AccessWindowHorizontal output_access(output->info(), 0, num_elems_processed_per_iteration_x); + AccessWindowHorizontal output_access(output, 0, num_elems_processed_per_iteration_x); - update_window_and_padding(win, - AccessWindowStatic(input0->info(), 0, 0, input0->info()->tensor_shape().x(), 1), - AccessWindowHorizontal(input1->info(), 0, num_elems_processed_per_iteration_x), - output_access); + window_changed = update_window_and_padding(win, + AccessWindowStatic(input0, 0, 0, input0->tensor_shape().x(), 1), + AccessWindowHorizontal(input1, 0, num_elems_processed_per_iteration_x), + output_access); Coordinates coord; - coord.set_num_dimensions(output->info()->num_dimensions()); - output_access.set_valid_region(win, ValidRegion(coord, output->info()->tensor_shape())); - - INEKernel::configure(win); + coord.set_num_dimensions(output->num_dimensions()); + output_access.set_valid_region(win, ValidRegion(coord, output->tensor_shape())); } else { - switch(input0->info()->data_type()) + switch(input0->data_type()) { case DataType::F32: { @@ -1518,19 +1516,51 @@ void NEGEMMMatrixMultiplyKernel::configure(const ITensor *input0, const ITensor } // Configure kernel window - Window win = calculate_max_window(*output->info(), Steps(num_elems_processed_per_iteration_x, num_elems_processed_per_iteration_y)); + win = calculate_max_window(*output, Steps(num_elems_processed_per_iteration_x, num_elems_processed_per_iteration_y)); - AccessWindowRectangle output_access(output->info(), 0, 0, num_elems_processed_per_iteration_x, num_elems_processed_per_iteration_y); + AccessWindowRectangle output_access(output, 0, 0, num_elems_processed_per_iteration_x, num_elems_processed_per_iteration_y); - update_window_and_padding(win, - AccessWindowRectangle(input0->info(), 0, 0, 4, 1, 1.f, 0.25f), - AccessWindowStatic(input1->info(), 0, 0, input1->info()->tensor_shape().x(), ceil_to_multiple(input1->info()->tensor_shape().y(), 4)), - output_access); + window_changed = update_window_and_padding(win, + AccessWindowRectangle(input0, 0, 0, 4, 1, 1.f, 0.25f), + AccessWindowStatic(input1, 0, 0, input1->tensor_shape().x(), ceil_to_multiple(input1->tensor_shape().y(), 4)), + output_access); - output_access.set_valid_region(win, ValidRegion(Coordinates(0, 0), output->info()->tensor_shape())); - - INEKernel::configure(win); + output_access.set_valid_region(win, ValidRegion(Coordinates(0, 0), output->tensor_shape())); } + + Status err = (window_changed) ? ARM_COMPUTE_CREATE_ERROR(ErrorCode::RUNTIME_ERROR, "Insufficient Padding!") : Status{}; + return std::make_pair(err, win); +} +} // namespace + +NEGEMMMatrixMultiplyKernel::NEGEMMMatrixMultiplyKernel() + : _input0(nullptr), _input1(nullptr), _output(nullptr), _alpha(1.0f) +{ +} + +void NEGEMMMatrixMultiplyKernel::configure(const ITensor *input0, const ITensor *input1, ITensor *output, float alpha) +{ + // Perform validate step + ARM_COMPUTE_ERROR_ON_NULLPTR(input0, input1, output); + ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(input0->info(), input1->info(), output->info())); + + _input0 = input0; + _input1 = input1; + _output = output; + _alpha = alpha; + + // Configure kernel window + auto win_config = validate_and_configure_window(input0->info(), input1->info(), output->info()); + ARM_COMPUTE_ERROR_THROW_ON(win_config.first); + INEKernel::configure(win_config.second); +} + +Status NEGEMMMatrixMultiplyKernel::validate(const ITensorInfo *input0, const ITensorInfo *input1, const ITensorInfo *output) +{ + ARM_COMPUTE_RETURN_ON_ERROR(validate_arguments(input0, input1, output)); + ARM_COMPUTE_RETURN_ON_ERROR(validate_and_configure_window(input0->clone().get(), input1->clone().get(), output->clone().get()).first); + + return Status{}; } void NEGEMMMatrixMultiplyKernel::run(const Window &window, const ThreadInfo &info) -- cgit v1.2.1