diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/CL/kernels/CLDepthConcatenateLayerKernel.cpp (renamed from src/core/CL/kernels/CLDepthConcatenateKernel.cpp) | 10 | ||||
-rw-r--r-- | src/core/CL/kernels/CLDepthConvertLayerKernel.cpp (renamed from src/core/CL/kernels/CLDepthConvertKernel.cpp) | 4 | ||||
-rw-r--r-- | src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.cpp (renamed from src/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.cpp) | 10 | ||||
-rw-r--r-- | src/core/CL/kernels/CLL2NormalizeLayerKernel.cpp (renamed from src/core/CL/kernels/CLL2NormalizeKernel.cpp) | 8 | ||||
-rw-r--r-- | src/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.cpp (renamed from src/core/GLES_COMPUTE/kernels/GCDepthConcatenateKernel.cpp) | 10 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEDepthConcatenateLayerKernel.cpp (renamed from src/core/NEON/kernels/NEDepthConcatenateKernel.cpp) | 10 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp (renamed from src/core/NEON/kernels/NEDepthConvertKernel.cpp) | 8 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp (renamed from src/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.cpp) | 10 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEL2NormalizeLayerKernel.cpp (renamed from src/core/NEON/kernels/NEL2NormalizeKernel.cpp) | 8 |
9 files changed, 39 insertions, 39 deletions
diff --git a/src/core/CL/kernels/CLDepthConcatenateKernel.cpp b/src/core/CL/kernels/CLDepthConcatenateLayerKernel.cpp index edfbf829ed..0275d4fd83 100644 --- a/src/core/CL/kernels/CLDepthConcatenateKernel.cpp +++ b/src/core/CL/kernels/CLDepthConcatenateLayerKernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h" +#include "arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h" #include "arm_compute/core/CL/CLHelpers.h" #include "arm_compute/core/CL/CLKernelLibrary.h" @@ -41,17 +41,17 @@ using namespace arm_compute; -CLDepthConcatenateKernel::CLDepthConcatenateKernel() +CLDepthConcatenateLayerKernel::CLDepthConcatenateLayerKernel() : _input(nullptr), _output(nullptr), _top_bottom(0), _left_right(0), _depth_offset(0) { } -BorderSize CLDepthConcatenateKernel::border_size() const +BorderSize CLDepthConcatenateLayerKernel::border_size() const { return BorderSize(_top_bottom, _left_right); } -void CLDepthConcatenateKernel::configure(const ICLTensor *input, unsigned int depth_offset, ICLTensor *output) +void CLDepthConcatenateLayerKernel::configure(const ICLTensor *input, unsigned int depth_offset, ICLTensor *output) { static std::map<int, std::pair<std::string, int>> configs_map = { @@ -108,7 +108,7 @@ void CLDepthConcatenateKernel::configure(const ICLTensor *input, unsigned int de ICLKernel::configure(win); } -void CLDepthConcatenateKernel::run(const Window &window, cl::CommandQueue &queue) +void CLDepthConcatenateLayerKernel::run(const Window &window, cl::CommandQueue &queue) { ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(ICLKernel::window(), window); diff --git a/src/core/CL/kernels/CLDepthConvertKernel.cpp b/src/core/CL/kernels/CLDepthConvertLayerKernel.cpp index b2132073d5..83908a1469 100644 --- a/src/core/CL/kernels/CLDepthConvertKernel.cpp +++ b/src/core/CL/kernels/CLDepthConvertLayerKernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/CL/kernels/CLDepthConvertKernel.h" +#include "arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h" #include "arm_compute/core/CL/CLHelpers.h" #include "arm_compute/core/CL/CLKernelLibrary.h" @@ -38,7 +38,7 @@ using namespace arm_compute; -void CLDepthConvertKernel::configure(const ICLTensor *input, ICLTensor *output, ConvertPolicy policy, uint32_t shift) +void CLDepthConvertLayerKernel::configure(const ICLTensor *input, ICLTensor *output, ConvertPolicy policy, uint32_t shift) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QS8, DataType::U8, DataType::S16, DataType::QS16, DataType::U16, DataType::U32, DataType::S32, DataType::F32); diff --git a/src/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.cpp b/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.cpp index e86c55fbc0..003f1f8330 100644 --- a/src/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.cpp +++ b/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/CL/kernels/CLDepthwiseConvolution3x3Kernel.h" +#include "arm_compute/core/CL/kernels/CLDepthwiseConvolutionLayer3x3Kernel.h" #include "arm_compute/core/AccessWindowStatic.h" #include "arm_compute/core/CL/CLHelpers.h" @@ -60,17 +60,17 @@ TensorShape get_output_shape(TensorShape input_shape, TensorShape weights_shape, } } // namespace -CLDepthwiseConvolution3x3Kernel::CLDepthwiseConvolution3x3Kernel() +CLDepthwiseConvolutionLayer3x3Kernel::CLDepthwiseConvolutionLayer3x3Kernel() : _border_size(0), _input(), _output(), _weights(), _biases(), _conv_stride_x(0), _conv_stride_y(0), _conv_pad_left(0), _conv_pad_top(0) { } -BorderSize CLDepthwiseConvolution3x3Kernel::border_size() const +BorderSize CLDepthwiseConvolutionLayer3x3Kernel::border_size() const { return _border_size; } -void CLDepthwiseConvolution3x3Kernel::configure(const ICLTensor *input, const ICLTensor *weights, const ICLTensor *biases, ICLTensor *output, const PadStrideInfo &conv_info) +void CLDepthwiseConvolutionLayer3x3Kernel::configure(const ICLTensor *input, const ICLTensor *weights, const ICLTensor *biases, ICLTensor *output, const PadStrideInfo &conv_info) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QASYMM8, DataType::F32); ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, weights); @@ -179,7 +179,7 @@ void CLDepthwiseConvolution3x3Kernel::configure(const ICLTensor *input, const IC ICLKernel::configure(win); } -void CLDepthwiseConvolution3x3Kernel::run(const Window &window, cl::CommandQueue &queue) +void CLDepthwiseConvolutionLayer3x3Kernel::run(const Window &window, cl::CommandQueue &queue) { ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(IKernel::window(), window); diff --git a/src/core/CL/kernels/CLL2NormalizeKernel.cpp b/src/core/CL/kernels/CLL2NormalizeLayerKernel.cpp index 3e0758c980..36e351e048 100644 --- a/src/core/CL/kernels/CLL2NormalizeKernel.cpp +++ b/src/core/CL/kernels/CLL2NormalizeLayerKernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/CL/kernels/CLL2NormalizeKernel.h" +#include "arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h" #include "arm_compute/core/CL/CLHelpers.h" #include "arm_compute/core/CL/CLKernelLibrary.h" @@ -37,12 +37,12 @@ using namespace arm_compute; -CLL2NormalizeKernel::CLL2NormalizeKernel() +CLL2NormalizeLayerKernel::CLL2NormalizeLayerKernel() : _input(nullptr), _sum(nullptr), _output(nullptr), _axis(0), _epsilon(1e-12) { } -void CLL2NormalizeKernel::configure(const ICLTensor *input, const ICLTensor *sum, ICLTensor *output, unsigned int axis, float epsilon) +void CLL2NormalizeLayerKernel::configure(const ICLTensor *input, const ICLTensor *sum, ICLTensor *output, unsigned int axis, float epsilon) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::F32); ARM_COMPUTE_ERROR_ON_NULLPTR(output); @@ -87,7 +87,7 @@ void CLL2NormalizeKernel::configure(const ICLTensor *input, const ICLTensor *sum ICLKernel::configure(win); } -void CLL2NormalizeKernel::run(const Window &window, cl::CommandQueue &queue) +void CLL2NormalizeLayerKernel::run(const Window &window, cl::CommandQueue &queue) { ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(IKernel::window(), window); diff --git a/src/core/GLES_COMPUTE/kernels/GCDepthConcatenateKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.cpp index b90a8e7b89..a6111782fd 100644 --- a/src/core/GLES_COMPUTE/kernels/GCDepthConcatenateKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateKernel.h" +#include "arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/GLES_COMPUTE/GCHelpers.h" @@ -37,17 +37,17 @@ using namespace arm_compute; -GCDepthConcatenateKernel::GCDepthConcatenateKernel() +GCDepthConcatenateLayerKernel::GCDepthConcatenateLayerKernel() : _input(nullptr), _output(nullptr), _top_bottom(0), _left_right(0) { } -BorderSize GCDepthConcatenateKernel::border_size() const +BorderSize GCDepthConcatenateLayerKernel::border_size() const { return BorderSize(_top_bottom, _left_right); } -void GCDepthConcatenateKernel::configure(const IGCTensor *input, unsigned int depth_offset, IGCTensor *output) +void GCDepthConcatenateLayerKernel::configure(const IGCTensor *input, unsigned int depth_offset, IGCTensor *output) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::F16, DataType::F32); ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); @@ -111,7 +111,7 @@ void GCDepthConcatenateKernel::configure(const IGCTensor *input, unsigned int de IGCKernel::configure(win); } -void GCDepthConcatenateKernel::run(const Window &window) +void GCDepthConcatenateLayerKernel::run(const Window &window) { ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(IGCKernel::window(), window); diff --git a/src/core/NEON/kernels/NEDepthConcatenateKernel.cpp b/src/core/NEON/kernels/NEDepthConcatenateLayerKernel.cpp index 7a62b0cb03..01b0f10f70 100644 --- a/src/core/NEON/kernels/NEDepthConcatenateKernel.cpp +++ b/src/core/NEON/kernels/NEDepthConcatenateLayerKernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/NEON/kernels/NEDepthConcatenateKernel.h" +#include "arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/Helpers.h" @@ -95,17 +95,17 @@ void depth_concat(const ITensor *in, ITensor *out, std::pair<int, int> start_xy, } } // namespace -NEDepthConcatenateKernel::NEDepthConcatenateKernel() +NEDepthConcatenateLayerKernel::NEDepthConcatenateLayerKernel() : _func(nullptr), _input(nullptr), _output(nullptr), _top_bottom(0), _left_right(0), _depth_offset(0) { } -BorderSize NEDepthConcatenateKernel::border_size() const +BorderSize NEDepthConcatenateLayerKernel::border_size() const { return BorderSize(_top_bottom, _left_right); } -void NEDepthConcatenateKernel::configure(const ITensor *input, unsigned int depth_offset, ITensor *output) +void NEDepthConcatenateLayerKernel::configure(const ITensor *input, unsigned int depth_offset, ITensor *output) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QS8, DataType::QS16, DataType::F16, DataType::F32); ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); @@ -159,7 +159,7 @@ void NEDepthConcatenateKernel::configure(const ITensor *input, unsigned int dept INEKernel::configure(win); } -void NEDepthConcatenateKernel::run(const Window &window, const ThreadInfo &info) +void NEDepthConcatenateLayerKernel::run(const Window &window, const ThreadInfo &info) { ARM_COMPUTE_UNUSED(info); ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); diff --git a/src/core/NEON/kernels/NEDepthConvertKernel.cpp b/src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp index d97a20be65..c29cb57513 100644 --- a/src/core/NEON/kernels/NEDepthConvertKernel.cpp +++ b/src/core/NEON/kernels/NEDepthConvertLayerKernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/NEON/kernels/NEDepthConvertKernel.h" +#include "arm_compute/core/NEON/kernels/NEDepthConvertLayerKernel.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/Helpers.h" @@ -39,12 +39,12 @@ namespace arm_compute class Coordinates; } // namespace arm_compute -NEDepthConvertKernel::NEDepthConvertKernel() +NEDepthConvertLayerKernel::NEDepthConvertLayerKernel() : _input(nullptr), _output(nullptr), _policy(), _shift(0), _fixed_point_position_input(0), _fixed_point_position_output(0) { } -void NEDepthConvertKernel::configure(ITensor *input, ITensor *output, ConvertPolicy policy, uint32_t shift) +void NEDepthConvertLayerKernel::configure(ITensor *input, ITensor *output, ConvertPolicy policy, uint32_t shift) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8, DataType::QS8, DataType::S16, DataType::U16, DataType::QS16, DataType::F32); @@ -120,7 +120,7 @@ void NEDepthConvertKernel::configure(ITensor *input, ITensor *output, ConvertPol ICPPKernel::configure(win); } -void NEDepthConvertKernel::run(const Window &window, const ThreadInfo &info) +void NEDepthConvertLayerKernel::run(const Window &window, const ThreadInfo &info) { ARM_COMPUTE_UNUSED(info); ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); diff --git a/src/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.cpp b/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp index 5c4bd34e05..02962e0492 100644 --- a/src/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.cpp +++ b/src/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/NEON/kernels/NEDepthwiseConvolution3x3Kernel.h" +#include "arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayer3x3Kernel.h" #include "arm_compute/core/NEON/kernels/convolution/NEDirectConvolutionDetail.h" #include "arm_compute/core/AccessWindowStatic.h" @@ -40,17 +40,17 @@ using namespace arm_compute; using namespace arm_compute::detail; -NEDepthwiseConvolution3x3Kernel::NEDepthwiseConvolution3x3Kernel() +NEDepthwiseConvolutionLayer3x3Kernel::NEDepthwiseConvolutionLayer3x3Kernel() : _border_size(0), _input(), _output(), _weights(), _conv_info() { } -BorderSize NEDepthwiseConvolution3x3Kernel::border_size() const +BorderSize NEDepthwiseConvolutionLayer3x3Kernel::border_size() const { return _border_size; } -void NEDepthwiseConvolution3x3Kernel::configure(const ITensor *input, const ITensor *weights, ITensor *output, const PadStrideInfo &conv_info) +void NEDepthwiseConvolutionLayer3x3Kernel::configure(const ITensor *input, const ITensor *weights, ITensor *output, const PadStrideInfo &conv_info) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::F32); ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output, weights); @@ -161,7 +161,7 @@ public: } }; -void NEDepthwiseConvolution3x3Kernel::run(const Window &window, const ThreadInfo &info) +void NEDepthwiseConvolutionLayer3x3Kernel::run(const Window &window, const ThreadInfo &info) { ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); ARM_COMPUTE_UNUSED(info); diff --git a/src/core/NEON/kernels/NEL2NormalizeKernel.cpp b/src/core/NEON/kernels/NEL2NormalizeLayerKernel.cpp index 12c532afd5..3bf1d9400e 100644 --- a/src/core/NEON/kernels/NEL2NormalizeKernel.cpp +++ b/src/core/NEON/kernels/NEL2NormalizeLayerKernel.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/core/NEON/kernels/NEL2NormalizeKernel.h" +#include "arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/Helpers.h" @@ -69,12 +69,12 @@ void l2_normalize_X(const ITensor *in, const ITensor *sum, ITensor *out, float e } } // namespace -NEL2NormalizeKernel::NEL2NormalizeKernel() +NEL2NormalizeLayerKernel::NEL2NormalizeLayerKernel() : _input(nullptr), _sum(nullptr), _output(nullptr), _axis(0), _epsilon(1e-12) { } -void NEL2NormalizeKernel::configure(const ITensor *input, const ITensor *sum, ITensor *output, unsigned int axis, float epsilon) +void NEL2NormalizeLayerKernel::configure(const ITensor *input, const ITensor *sum, ITensor *output, unsigned int axis, float epsilon) { ARM_COMPUTE_ERROR_ON_NULLPTR(input, sum, output); ARM_COMPUTE_ERROR_ON_MSG(axis >= TensorShape::num_max_dimensions, "Normalization axis greater than max number of dimensions"); @@ -109,7 +109,7 @@ void NEL2NormalizeKernel::configure(const ITensor *input, const ITensor *sum, IT INEKernel::configure(win); } -void NEL2NormalizeKernel::run(const Window &window, const ThreadInfo &info) +void NEL2NormalizeLayerKernel::run(const Window &window, const ThreadInfo &info) { ARM_COMPUTE_UNUSED(info); ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); |