diff options
author | Pablo Tello <pablo.tello@arm.com> | 2022-03-10 17:05:34 +0000 |
---|---|---|
committer | Pablo Marquez Tello <pablo.tello@arm.com> | 2022-07-13 14:40:03 +0000 |
commit | 29cab36ddd73c174bf6b2de453663aa49c1cc576 (patch) | |
tree | fe186889cfd93b90b0cbd7917e99d9dff62bff8c /src/core | |
parent | 2186aef84fe1206545f6d5bc321752044fdd1b3d (diff) | |
download | ComputeLibrary-29cab36ddd73c174bf6b2de453663aa49c1cc576.tar.gz |
Fixed clang-cl errors on Windows native builds.
Partially resolves MLCE-739
Change-Id: Ice06a96d6a8a26b31e334ba4e697cd41d352b026
Signed-off-by: Pablo Tello <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7364
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/NEON/kernels/convolution/common/padding.cpp | 2 | ||||
-rw-r--r-- | src/core/NEON/kernels/convolution/common/padding.hpp | 28 | ||||
-rw-r--r-- | src/core/NEON/kernels/convolution/winograd/padding.cpp | 29 |
3 files changed, 29 insertions, 30 deletions
diff --git a/src/core/NEON/kernels/convolution/common/padding.cpp b/src/core/NEON/kernels/convolution/common/padding.cpp index f57706fef6..5960e66968 100644 --- a/src/core/NEON/kernels/convolution/common/padding.cpp +++ b/src/core/NEON/kernels/convolution/common/padding.cpp @@ -81,7 +81,7 @@ template void copy_and_pad_tile( template void copy_and_pad_tile( unsigned int, unsigned int, unsigned int, - const float *, unsigned int, unsigned int, + float const *, unsigned int, unsigned int, float *, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, float ); diff --git a/src/core/NEON/kernels/convolution/common/padding.hpp b/src/core/NEON/kernels/convolution/common/padding.hpp index b6f95872c0..397d902e29 100644 --- a/src/core/NEON/kernels/convolution/common/padding.hpp +++ b/src/core/NEON/kernels/convolution/common/padding.hpp @@ -34,20 +34,20 @@ namespace padding */ template <typename T> void copy_and_pad_tile( - unsigned int tile_rows, - unsigned int tile_cols, - unsigned int n_channels, - const T *inptr, - unsigned int in_row_stride, - unsigned int in_col_stride, - T* outptr, - unsigned int out_row_stride, - unsigned int out_col_stride, - unsigned int pad_top, - unsigned int pad_left, - unsigned int pad_bottom, - unsigned int pad_right, - T pad_value=static_cast<T>(0) + const unsigned int tile_rows, + const unsigned int tile_cols, + const unsigned int n_channels, + const T * const inptr, + const unsigned int in_row_stride, + const unsigned int in_col_stride, + T* const outptr, + const unsigned int out_row_stride, + const unsigned int out_col_stride, + const unsigned int pad_top, + const unsigned int pad_left, + const unsigned int pad_bottom, + const unsigned int pad_right, + const T pad_value=static_cast<T>(0) ); /** Copy a tile and remove padding elements in the output. diff --git a/src/core/NEON/kernels/convolution/winograd/padding.cpp b/src/core/NEON/kernels/convolution/winograd/padding.cpp index 1d44c384d9..aca8448658 100644 --- a/src/core/NEON/kernels/convolution/winograd/padding.cpp +++ b/src/core/NEON/kernels/convolution/winograd/padding.cpp @@ -28,23 +28,22 @@ namespace padding { - template <typename T> void copy_and_pad_tile( - const unsigned int tile_rows, - const unsigned int tile_cols, - const unsigned int n_channels, - const T* const inptr, - const unsigned int in_row_stride, - const unsigned int in_col_stride, - T* const outptr, - const unsigned int out_row_stride, - const unsigned int out_col_stride, - const unsigned int pad_top, - const unsigned int pad_left, - const unsigned int pad_bottom, - const unsigned int pad_right, - const T pad_value + unsigned int tile_rows, + unsigned int tile_cols, + unsigned int n_channels, + const T *inptr, + unsigned int in_row_stride, + unsigned int in_col_stride, + T* outptr, + unsigned int out_row_stride, + unsigned int out_col_stride, + unsigned int pad_top, + unsigned int pad_left, + unsigned int pad_bottom, + unsigned int pad_right, + T pad_value ) { for (unsigned int out_i = 0; out_i < tile_rows; out_i++) |