diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/NEON/kernels/NEConvolutionKernel.cpp | 8 | ||||
| -rw-r--r-- | src/runtime/CL/functions/CLConvolution.cpp | 5 | ||||
| -rw-r--r-- | src/runtime/NEON/functions/NEConvolution.cpp | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/core/NEON/kernels/NEConvolutionKernel.cpp b/src/core/NEON/kernels/NEConvolutionKernel.cpp index 3a4884eb21..7468f58ca5 100644 --- a/src/core/NEON/kernels/NEConvolutionKernel.cpp +++ b/src/core/NEON/kernels/NEConvolutionKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -1522,13 +1522,13 @@ void NEConvolutionRectangleKernel::run(const Window &window, const ThreadInfo &i }; // Run appropriate function - switch(_output->info()->format()) + switch(_output->info()->data_type()) { - case Format::U8: + case DataType::U8: ARM_COMPUTE_ERROR_ON(_func_idx >= func_table_u8.size()); (this->*func_table_u8[_func_idx])(window); break; - case Format::S16: + case DataType::S16: ARM_COMPUTE_ERROR_ON(_func_idx >= func_table_s16.size()); (this->*func_table_s16[_func_idx])(window); break; diff --git a/src/runtime/CL/functions/CLConvolution.cpp b/src/runtime/CL/functions/CLConvolution.cpp index a9b086773c..0131801679 100644 --- a/src/runtime/CL/functions/CLConvolution.cpp +++ b/src/runtime/CL/functions/CLConvolution.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -53,7 +53,8 @@ CLConvolutionSquare<matrix_size>::CLConvolutionSquare(std::shared_ptr<IMemoryMan } template <unsigned int matrix_size> -void CLConvolutionSquare<matrix_size>::configure(ICLTensor *input, ICLTensor *output, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value) +void CLConvolutionSquare<matrix_size>::configure(ICLTensor *input, ICLTensor *output, const int16_t *conv, uint32_t scale, BorderMode border_mode, + uint8_t constant_border_value) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8); ARM_COMPUTE_ERROR_ON(conv == nullptr); diff --git a/src/runtime/NEON/functions/NEConvolution.cpp b/src/runtime/NEON/functions/NEConvolution.cpp index f10ffa6d14..b84dfd344c 100644 --- a/src/runtime/NEON/functions/NEConvolution.cpp +++ b/src/runtime/NEON/functions/NEConvolution.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -54,7 +54,8 @@ NEConvolutionSquare<matrix_size>::NEConvolutionSquare(std::shared_ptr<IMemoryMan } template <unsigned int matrix_size> -void NEConvolutionSquare<matrix_size>::configure(ITensor *input, ITensor *output, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value) +void NEConvolutionSquare<matrix_size>::configure(ITensor *input, ITensor *output, const int16_t *conv, uint32_t scale, BorderMode border_mode, + uint8_t constant_border_value) { ARM_COMPUTE_ERROR_ON(conv == nullptr); ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8); |