diff options
| author | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-10-19 16:00:11 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-10-20 10:27:40 +0000 |
| commit | 68dd25fbe6e4d3c3513fa5993863419769aa08fc (patch) | |
| tree | b918be923f9e4550c306d7f44d168ab938a71fc8 /src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp | |
| parent | f0a4e609d98f111b6a7d4a2b578d1b7cba64b805 (diff) | |
| download | ComputeLibrary-68dd25fbe6e4d3c3513fa5993863419769aa08fc.tar.gz | |
COMPMID-3637: Move utility headers from arm_compute to src
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: If9d6fa8c900b68c4b6fd373f2fc1f9abb83ea917
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4145
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp')
| -rw-r--r-- | src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp index 302b21be0d..9ce8acea09 100644 --- a/src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.cpp @@ -23,7 +23,6 @@ */ #include "arm_compute/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.h" -#include "arm_compute/core/AccessWindowStatic.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/GLES_COMPUTE/GCHelpers.h" #include "arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h" @@ -33,6 +32,9 @@ #include "arm_compute/core/ITensor.h" #include "arm_compute/core/Types.h" #include "arm_compute/core/Validate.h" +#include "src/core/AccessWindowStatic.h" +#include "src/core/helpers/AutoConfiguration.h" +#include "src/core/helpers/WindowHelpers.h" #include "support/StringSupport.h" using namespace arm_compute; @@ -44,7 +46,7 @@ GCDirectConvolutionLayerKernel<kernel_size>::GCDirectConvolutionLayerKernel() } template <unsigned int kernel_size> -BorderSize GCDirectConvolutionLayerKernel<kernel_size>::border_size() const +BorderSize GCDirectConvolutionLayerKernel<kernel_size>::border_size() const { return _border_size; } @@ -70,8 +72,8 @@ void GCDirectConvolutionLayerKernel<kernel_size>::configure(const IGCTensor *inp } // Get convolved dimensions - unsigned int owidth = 0; - unsigned int oheight = 0; + unsigned int owidth = 0; + unsigned int oheight = 0; std::tie(owidth, oheight) = scaled_dimensions(input->info()->dimension(0), input->info()->dimension(1), kernel_size, kernel_size, conv_info); TensorShape output_shape = input->info()->tensor_shape(); @@ -238,20 +240,20 @@ void GCDirectConvolutionLayerKernel<kernel_size>::configure(const IGCTensor *inp num_elems_written_per_iteration_x = 4; #elif defined(PROCESS_4X_2Y_1Z) options.emplace("#define PROCESS_4X_2Y_1Z"); - num_elems_read_per_iteration_x = 4; - num_elems_read_per_iteration_y = 2; + num_elems_read_per_iteration_x = 4; + num_elems_read_per_iteration_y = 2; num_elems_written_per_iteration_x = 4; num_elems_written_per_iteration_y = 2; #elif defined(PROCESS_4X_3Y_1Z) options.emplace("#define PROCESS_4X_3Y_1Z"); - num_elems_read_per_iteration_x = 4; - num_elems_read_per_iteration_y = 3; + num_elems_read_per_iteration_x = 4; + num_elems_read_per_iteration_y = 3; num_elems_written_per_iteration_x = 4; num_elems_written_per_iteration_y = 3; #elif defined(PROCESS_4X_4Y_1Z) options.emplace("#define PROCESS_4X_4Y_1Z"); - num_elems_read_per_iteration_x = 4; - num_elems_read_per_iteration_y = 4; + num_elems_read_per_iteration_x = 4; + num_elems_read_per_iteration_y = 4; num_elems_written_per_iteration_x = 4; num_elems_written_per_iteration_y = 4; #elif defined(PROCESS_4X_2Y_2Z) |