aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/CL/kernels/CLPermuteKernel.cpp3
-rw-r--r--src/core/CPP/kernels/CPPPermuteKernel.cpp12
-rw-r--r--src/core/NEON/kernels/NEWinogradLayerKernel.cpp2
3 files changed, 7 insertions, 10 deletions
diff --git a/src/core/CL/kernels/CLPermuteKernel.cpp b/src/core/CL/kernels/CLPermuteKernel.cpp
index 7001c5565b..132de60b68 100644
--- a/src/core/CL/kernels/CLPermuteKernel.cpp
+++ b/src/core/CL/kernels/CLPermuteKernel.cpp
@@ -46,7 +46,8 @@ TensorShape get_output_shape(const ITensorInfo *input, const PermutationVector &
permute(output_shape, perm);
return output_shape;
}
-}
+} // namespace
+
void CLPermuteKernel::configure(const ICLTensor *input, ICLTensor *output, const PermutationVector &perm)
{
ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8, DataType::S8, DataType::QS8, DataType::QASYMM8,
diff --git a/src/core/CPP/kernels/CPPPermuteKernel.cpp b/src/core/CPP/kernels/CPPPermuteKernel.cpp
index c7bae870d1..298c700809 100644
--- a/src/core/CPP/kernels/CPPPermuteKernel.cpp
+++ b/src/core/CPP/kernels/CPPPermuteKernel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018 ARM Limited.
+ * Copyright (c) 2017-2018 ARM Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -76,17 +76,13 @@ inline void permute_strides(Dimensions<T> &dimensions, const PermutationVector &
} // namespace
-
-
-
template <typename T>
void CPPPermuteKernel::run_permute(const Window &window)
{
-
- Strides strides = _output->info()->strides_in_bytes();
+ Strides strides = _output->info()->strides_in_bytes();
Strides perm_strides = strides;
- permute_strides(perm_strides,_perm);
- const int output_stride_w = strides[3];
+ permute_strides(perm_strides, _perm);
+ const int output_stride_w = strides[3];
Window window_out(window);
const Window::Dimension zero_window = Window::Dimension(0, 0, 0);
for(size_t d = 0; d <= _perm.num_dimensions(); ++d)
diff --git a/src/core/NEON/kernels/NEWinogradLayerKernel.cpp b/src/core/NEON/kernels/NEWinogradLayerKernel.cpp
index 24d72eddd8..ea48e1f32b 100644
--- a/src/core/NEON/kernels/NEWinogradLayerKernel.cpp
+++ b/src/core/NEON/kernels/NEWinogradLayerKernel.cpp
@@ -118,7 +118,7 @@ unsigned int NEWinogradLayerKernel::get_output_storage_size(
return T::get_output_storage_size(n_batches, n_rows, n_cols, n_output_channels, same_padding);
}
-size_t NEWinogradLayerKernel::get_weight_storage_size(const int n_output_channels, const int n_input_channels)
+unsigned int NEWinogradLayerKernel::get_weight_storage_size(const int n_output_channels, const int n_input_channels)
{
return T::get_weight_storage_size(n_output_channels, n_input_channels);
}