diff options
author | Giorgio Arena <giorgio.arena@arm.com> | 2017-11-23 11:45:24 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:41:58 +0000 |
commit | 04a8f8c4994f1c32b3f16a832c0e6f2599364c02 (patch) | |
tree | bb96843720896c60f8876a753b0a61b1efcab73b /src | |
parent | 58c5794b917dae10ff115dd85ec69e2ca41136c1 (diff) | |
download | ComputeLibrary-04a8f8c4994f1c32b3f16a832c0e6f2599364c02.tar.gz |
COMPMID-692 Consistent names for the interfaces
Change-Id: I4b1f3f0da9ff5342c7de7083736fe91871d14e5b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/110351
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src')
-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 | ||||
-rw-r--r-- | src/graph/operations/CLSimpleOperations.cpp | 10 | ||||
-rw-r--r-- | src/graph/operations/NESimpleOperations.cpp | 10 | ||||
-rw-r--r-- | src/runtime/CL/functions/CLDepthConcatenateLayer.cpp (renamed from src/runtime/CL/functions/CLDepthConcatenate.cpp) | 10 | ||||
-rw-r--r-- | src/runtime/CL/functions/CLDepthConvertLayer.cpp (renamed from src/runtime/CL/functions/CLDepthConvert.cpp) | 8 | ||||
-rw-r--r-- | src/runtime/CL/functions/CLDepthwiseConvolutionLayer.cpp (renamed from src/runtime/CL/functions/CLDepthwiseConvolution.cpp) | 14 | ||||
-rw-r--r-- | src/runtime/CL/functions/CLL2NormalizeLayer.cpp (renamed from src/runtime/CL/functions/CLL2Normalize.cpp) | 10 | ||||
-rw-r--r-- | src/runtime/CL/functions/CLLaplacianPyramid.cpp | 2 | ||||
-rwxr-xr-x | src/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.cpp (renamed from src/runtime/GLES_COMPUTE/functions/GCDepthConcatenate.cpp) | 10 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp (renamed from src/runtime/NEON/functions/NEDepthConcatenate.cpp) | 10 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEDepthConvertLayer.cpp (renamed from src/runtime/NEON/functions/NEDepthConvert.cpp) | 8 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp (renamed from src/runtime/NEON/functions/NEDepthwiseConvolution.cpp) | 14 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEL2NormalizeLayer.cpp (renamed from src/runtime/NEON/functions/NEL2Normalize.cpp) | 8 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NELaplacianPyramid.cpp | 2 |
22 files changed, 97 insertions, 97 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); diff --git a/src/graph/operations/CLSimpleOperations.cpp b/src/graph/operations/CLSimpleOperations.cpp index 647f88f0e2..8f2bf23ce3 100644 --- a/src/graph/operations/CLSimpleOperations.cpp +++ b/src/graph/operations/CLSimpleOperations.cpp @@ -106,7 +106,7 @@ REGISTER_SIMPLE_OPERATION(CLBatchNormalizationLayerOperation, OPENCL, OperationT return std::move(batch_norm); } -/* DepthConvert Layer */ +/* DepthConvertLayer Layer */ REGISTER_SIMPLE_OPERATION(CLDepthConvertLayerOperation, OPENCL, OperationType::DepthConvertLayer) { ARM_COMPUTE_ERROR_ON(ctx.num_inputs() != 1); @@ -121,7 +121,7 @@ REGISTER_SIMPLE_OPERATION(CLDepthConvertLayerOperation, OPENCL, OperationType::D const auto shift = ctx.parameter<uint32_t>("shift"); // Create and configure function - auto depthconvert = arm_compute::support::cpp14::make_unique<arm_compute::CLDepthConvert>(); + auto depthconvert = arm_compute::support::cpp14::make_unique<arm_compute::CLDepthConvertLayer>(); depthconvert->configure(in, out, conv_policy, shift); // Log info @@ -156,13 +156,13 @@ REGISTER_SIMPLE_OPERATION(CLDepthwiseConvolutionOperation, OPENCL, OperationType bool run_3x3_opt = opt3x3 && weights->info()->dimension(0) == 3; if(run_3x3_opt) { - auto depwthwise_conv = arm_compute::support::cpp14::make_unique<arm_compute::CLDepthwiseConvolution>(); + auto depwthwise_conv = arm_compute::support::cpp14::make_unique<arm_compute::CLDepthwiseConvolutionLayer>(); depwthwise_conv->configure(in, weights, biases, out, conv_info); func = std::move(depwthwise_conv); } else { - auto depwthwise_conv = arm_compute::support::cpp14::make_unique<arm_compute::CLDepthwiseConvolution3x3>(); + auto depwthwise_conv = arm_compute::support::cpp14::make_unique<arm_compute::CLDepthwiseConvolutionLayer3x3>(); depwthwise_conv->configure(in, weights, biases, out, conv_info); func = std::move(depwthwise_conv); } @@ -313,7 +313,7 @@ REGISTER_SIMPLE_OPERATION(CLL2NormalizeLayerOperation, OPENCL, OperationType::L2 const auto epsilon = ctx.parameter<float>("epsilon"); // Create and configure function - auto l2_norm = arm_compute::support::cpp14::make_unique<arm_compute::CLL2Normalize>(); + auto l2_norm = arm_compute::support::cpp14::make_unique<arm_compute::CLL2NormalizeLayer>(); l2_norm->configure(in, out, axis, epsilon); // Log info diff --git a/src/graph/operations/NESimpleOperations.cpp b/src/graph/operations/NESimpleOperations.cpp index f234341cec..bb99e8da4b 100644 --- a/src/graph/operations/NESimpleOperations.cpp +++ b/src/graph/operations/NESimpleOperations.cpp @@ -106,7 +106,7 @@ REGISTER_SIMPLE_OPERATION(NEBatchNormalizationLayerOperation, NEON, OperationTyp return std::move(batch_norm); } -/* DepthConvert Layer */ +/* DepthConvertLayer Layer */ REGISTER_SIMPLE_OPERATION(NEDepthConvertLayerOperation, NEON, OperationType::DepthConvertLayer) { ARM_COMPUTE_ERROR_ON(ctx.num_inputs() != 1); @@ -121,7 +121,7 @@ REGISTER_SIMPLE_OPERATION(NEDepthConvertLayerOperation, NEON, OperationType::Dep const auto shift = ctx.parameter<uint32_t>("shift"); // Create and configure function - auto depthconvert = arm_compute::support::cpp14::make_unique<arm_compute::NEDepthConvert>(); + auto depthconvert = arm_compute::support::cpp14::make_unique<arm_compute::NEDepthConvertLayer>(); depthconvert->configure(in, out, conv_policy, shift); // Log info @@ -156,13 +156,13 @@ REGISTER_SIMPLE_OPERATION(NEDepthwiseConvolutionOperation, NEON, OperationType:: bool run_3x3_opt = opt3x3 && weights->info()->dimension(0) == 3; if(run_3x3_opt) { - auto depwthwise_conv = arm_compute::support::cpp14::make_unique<arm_compute::NEDepthwiseConvolution>(); + auto depwthwise_conv = arm_compute::support::cpp14::make_unique<arm_compute::NEDepthwiseConvolutionLayer>(); depwthwise_conv->configure(in, weights, biases, out, conv_info); func = std::move(depwthwise_conv); } else { - auto depwthwise_conv = arm_compute::support::cpp14::make_unique<arm_compute::NEDepthwiseConvolution3x3>(); + auto depwthwise_conv = arm_compute::support::cpp14::make_unique<arm_compute::NEDepthwiseConvolutionLayer3x3>(); depwthwise_conv->configure(in, weights, biases, out, conv_info); func = std::move(depwthwise_conv); } @@ -313,7 +313,7 @@ REGISTER_SIMPLE_OPERATION(NEL2NormalizeLayerOperation, NEON, OperationType::L2No const auto epsilon = ctx.parameter<float>("epsilon"); // Create and configure function - auto l2_norm = arm_compute::support::cpp14::make_unique<arm_compute::NEL2Normalize>(); + auto l2_norm = arm_compute::support::cpp14::make_unique<arm_compute::NEL2NormalizeLayer>(); l2_norm->configure(in, out, axis, epsilon); // Log info diff --git a/src/runtime/CL/functions/CLDepthConcatenate.cpp b/src/runtime/CL/functions/CLDepthConcatenateLayer.cpp index 89e44ca98e..05b5d54cf7 100644 --- a/src/runtime/CL/functions/CLDepthConcatenate.cpp +++ b/src/runtime/CL/functions/CLDepthConcatenateLayer.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/runtime/CL/functions/CLDepthConcatenate.h" +#include "arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h" #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/Error.h" @@ -33,7 +33,7 @@ using namespace arm_compute; -CLDepthConcatenate::CLDepthConcatenate() // NOLINT +CLDepthConcatenateLayer::CLDepthConcatenateLayer() // NOLINT : _inputs_vector(), _concat_kernels_vector(), _border_handlers_vector(), @@ -41,7 +41,7 @@ CLDepthConcatenate::CLDepthConcatenate() // NOLINT { } -void CLDepthConcatenate::configure(std::vector<ICLTensor *> inputs_vector, ICLTensor *output) // NOLINT +void CLDepthConcatenateLayer::configure(std::vector<ICLTensor *> inputs_vector, ICLTensor *output) // NOLINT { ARM_COMPUTE_ERROR_ON(inputs_vector.size() < 2); @@ -49,7 +49,7 @@ void CLDepthConcatenate::configure(std::vector<ICLTensor *> inputs_vector, ICLTe unsigned int depth_offset = 0; - _concat_kernels_vector = arm_compute::support::cpp14::make_unique<CLDepthConcatenateKernel[]>(_num_inputs); + _concat_kernels_vector = arm_compute::support::cpp14::make_unique<CLDepthConcatenateLayerKernel[]>(_num_inputs); _border_handlers_vector = arm_compute::support::cpp14::make_unique<CLFillBorderKernel[]>(_num_inputs); TensorShape output_shape = calculate_depth_concatenate_shape(inputs_vector); @@ -66,7 +66,7 @@ void CLDepthConcatenate::configure(std::vector<ICLTensor *> inputs_vector, ICLTe } } -void CLDepthConcatenate::run() +void CLDepthConcatenateLayer::run() { cl::CommandQueue q = CLScheduler::get().queue(); diff --git a/src/runtime/CL/functions/CLDepthConvert.cpp b/src/runtime/CL/functions/CLDepthConvertLayer.cpp index b64d05b8b1..b448465909 100644 --- a/src/runtime/CL/functions/CLDepthConvert.cpp +++ b/src/runtime/CL/functions/CLDepthConvertLayer.cpp @@ -21,18 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/runtime/CL/functions/CLDepthConvert.h" +#include "arm_compute/runtime/CL/functions/CLDepthConvertLayer.h" -#include "arm_compute/core/CL/kernels/CLDepthConvertKernel.h" +#include "arm_compute/core/CL/kernels/CLDepthConvertLayerKernel.h" #include "support/ToolchainSupport.h" #include <utility> using namespace arm_compute; -void CLDepthConvert::configure(const ICLTensor *input, ICLTensor *output, ConvertPolicy policy, uint32_t shift) +void CLDepthConvertLayer::configure(const ICLTensor *input, ICLTensor *output, ConvertPolicy policy, uint32_t shift) { - auto k = arm_compute::support::cpp14::make_unique<CLDepthConvertKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLDepthConvertLayerKernel>(); k->configure(input, output, policy, shift); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLDepthwiseConvolution.cpp b/src/runtime/CL/functions/CLDepthwiseConvolutionLayer.cpp index 81149508dd..02273fe08b 100644 --- a/src/runtime/CL/functions/CLDepthwiseConvolution.cpp +++ b/src/runtime/CL/functions/CLDepthwiseConvolutionLayer.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/runtime/CL/functions/CLDepthwiseConvolution.h" +#include "arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h" #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/PixelValue.h" @@ -30,12 +30,12 @@ using namespace arm_compute; -CLDepthwiseConvolution3x3::CLDepthwiseConvolution3x3() +CLDepthwiseConvolutionLayer3x3::CLDepthwiseConvolutionLayer3x3() : _kernel(), _border_handler() { } -void CLDepthwiseConvolution3x3::configure(ICLTensor *input, const ICLTensor *weights, const ICLTensor *biases, ICLTensor *output, const PadStrideInfo &conv_info) +void CLDepthwiseConvolutionLayer3x3::configure(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); @@ -52,19 +52,19 @@ void CLDepthwiseConvolution3x3::configure(ICLTensor *input, const ICLTensor *wei _border_handler.configure(input, _kernel.border_size(), BorderMode::CONSTANT, zero_value); } -void CLDepthwiseConvolution3x3::run() +void CLDepthwiseConvolutionLayer3x3::run() { CLScheduler::get().enqueue(_border_handler); CLScheduler::get().enqueue(_kernel); } -CLDepthwiseConvolution::CLDepthwiseConvolution() +CLDepthwiseConvolutionLayer::CLDepthwiseConvolutionLayer() : _im2col_kernel(), _weights_reshape_kernel(), _v2mm_kernel(), _vector_to_tensor_kernel(), _v2mm_input_fill_border(), _v2mm_weights_fill_border(), _input_reshaped(), _weights_reshaped(), _v2mm_output() { } -void CLDepthwiseConvolution::configure(ICLTensor *input, const ICLTensor *weights, const ICLTensor *biases, ICLTensor *output, const PadStrideInfo &conv_info) +void CLDepthwiseConvolutionLayer::configure(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::F32); ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, weights); @@ -124,7 +124,7 @@ void CLDepthwiseConvolution::configure(ICLTensor *input, const ICLTensor *weight _v2mm_output.allocator()->allocate(); } -void CLDepthwiseConvolution::run() +void CLDepthwiseConvolutionLayer::run() { CLScheduler::get().enqueue(_im2col_kernel); diff --git a/src/runtime/CL/functions/CLL2Normalize.cpp b/src/runtime/CL/functions/CLL2NormalizeLayer.cpp index 99be8cae4c..d1bb65f1c9 100644 --- a/src/runtime/CL/functions/CLL2Normalize.cpp +++ b/src/runtime/CL/functions/CLL2NormalizeLayer.cpp @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/runtime/CL/functions/CLL2Normalize.h" +#include "arm_compute/runtime/CL/functions/CLL2NormalizeLayer.h" #include "arm_compute/core/CL/ICLTensor.h" -#include "arm_compute/core/CL/kernels/CLL2NormalizeKernel.h" +#include "arm_compute/core/CL/kernels/CLL2NormalizeLayerKernel.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/TensorInfo.h" @@ -34,12 +34,12 @@ using namespace arm_compute; -CLL2Normalize::CLL2Normalize(std::shared_ptr<IMemoryManager> memory_manager) +CLL2NormalizeLayer::CLL2NormalizeLayer(std::shared_ptr<IMemoryManager> memory_manager) : _memory_group(std::move(memory_manager)), _reduce_func(), _normalize_kernel(), _sumsq() { } -void CLL2Normalize::configure(ICLTensor *input, ICLTensor *output, unsigned int axis, float epsilon) +void CLL2NormalizeLayer::configure(ICLTensor *input, ICLTensor *output, unsigned int axis, float epsilon) { // Manage intermediate buffers _memory_group.manage(&_sumsq); @@ -52,7 +52,7 @@ void CLL2Normalize::configure(ICLTensor *input, ICLTensor *output, unsigned int _sumsq.allocator()->allocate(); } -void CLL2Normalize::run() +void CLL2NormalizeLayer::run() { _memory_group.acquire(); diff --git a/src/runtime/CL/functions/CLLaplacianPyramid.cpp b/src/runtime/CL/functions/CLLaplacianPyramid.cpp index a395487103..7e5278f380 100644 --- a/src/runtime/CL/functions/CLLaplacianPyramid.cpp +++ b/src/runtime/CL/functions/CLLaplacianPyramid.cpp @@ -29,7 +29,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/CL/CLTensor.h" #include "arm_compute/runtime/CL/functions/CLArithmeticSubtraction.h" -#include "arm_compute/runtime/CL/functions/CLDepthConvert.h" +#include "arm_compute/runtime/CL/functions/CLDepthConvertLayer.h" #include "arm_compute/runtime/CL/functions/CLGaussian5x5.h" #include "arm_compute/runtime/CL/functions/CLGaussianPyramid.h" #include "support/ToolchainSupport.h" diff --git a/src/runtime/GLES_COMPUTE/functions/GCDepthConcatenate.cpp b/src/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.cpp index ed756cf261..ee0b121695 100755 --- a/src/runtime/GLES_COMPUTE/functions/GCDepthConcatenate.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.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/runtime/GLES_COMPUTE/functions/GCDepthConcatenate.h" +#include "arm_compute/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/GLES_COMPUTE/IGCTensor.h" @@ -32,14 +32,14 @@ using namespace arm_compute; -GCDepthConcatenate::GCDepthConcatenate() //NOLINT +GCDepthConcatenateLayer::GCDepthConcatenateLayer() //NOLINT : _concat_kernels_vector(), _border_handlers_vector(), _num_inputs(0) { } -void GCDepthConcatenate::configure(std::vector<IGCTensor *> inputs_vector, IGCTensor *output) //NOLINT +void GCDepthConcatenateLayer::configure(std::vector<IGCTensor *> inputs_vector, IGCTensor *output) //NOLINT { ARM_COMPUTE_ERROR_ON(inputs_vector.size() < 2); @@ -47,7 +47,7 @@ void GCDepthConcatenate::configure(std::vector<IGCTensor *> inputs_vector, IGCTe unsigned int depth_offset = 0; - _concat_kernels_vector = arm_compute::support::cpp14::make_unique<GCDepthConcatenateKernel[]>(_num_inputs); + _concat_kernels_vector = arm_compute::support::cpp14::make_unique<GCDepthConcatenateLayerKernel[]>(_num_inputs); _border_handlers_vector = arm_compute::support::cpp14::make_unique<GCFillBorderKernel[]>(_num_inputs); for(unsigned int i = 0; i < _num_inputs; i++) @@ -59,7 +59,7 @@ void GCDepthConcatenate::configure(std::vector<IGCTensor *> inputs_vector, IGCTe } } -void GCDepthConcatenate::run() +void GCDepthConcatenateLayer::run() { for(unsigned i = 0; i < _num_inputs; i++) { diff --git a/src/runtime/NEON/functions/NEDepthConcatenate.cpp b/src/runtime/NEON/functions/NEDepthConcatenateLayer.cpp index f8ad2abe61..437c9417ce 100644 --- a/src/runtime/NEON/functions/NEDepthConcatenate.cpp +++ b/src/runtime/NEON/functions/NEDepthConcatenateLayer.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/runtime/NEON/functions/NEDepthConcatenate.h" +#include "arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/Helpers.h" @@ -33,7 +33,7 @@ using namespace arm_compute; -NEDepthConcatenate::NEDepthConcatenate() // NOLINT +NEDepthConcatenateLayer::NEDepthConcatenateLayer() // NOLINT : _inputs_vector(), _concat_kernels_vector(), _border_handlers_vector(), @@ -41,12 +41,12 @@ NEDepthConcatenate::NEDepthConcatenate() // NOLINT { } -void NEDepthConcatenate::configure(std::vector<ITensor *> inputs_vector, ITensor *output) // NOLINT +void NEDepthConcatenateLayer::configure(std::vector<ITensor *> inputs_vector, ITensor *output) // NOLINT { ARM_COMPUTE_ERROR_ON(inputs_vector.size() < 2); _num_inputs = inputs_vector.size(); - _concat_kernels_vector = arm_compute::support::cpp14::make_unique<NEDepthConcatenateKernel[]>(_num_inputs); + _concat_kernels_vector = arm_compute::support::cpp14::make_unique<NEDepthConcatenateLayerKernel[]>(_num_inputs); _border_handlers_vector = arm_compute::support::cpp14::make_unique<NEFillBorderKernel[]>(_num_inputs); TensorShape output_shape = calculate_depth_concatenate_shape(inputs_vector); @@ -64,7 +64,7 @@ void NEDepthConcatenate::configure(std::vector<ITensor *> inputs_vector, ITensor } } -void NEDepthConcatenate::run() +void NEDepthConcatenateLayer::run() { for(unsigned i = 0; i < _num_inputs; ++i) { diff --git a/src/runtime/NEON/functions/NEDepthConvert.cpp b/src/runtime/NEON/functions/NEDepthConvertLayer.cpp index 37857b6534..9a75404fcd 100644 --- a/src/runtime/NEON/functions/NEDepthConvert.cpp +++ b/src/runtime/NEON/functions/NEDepthConvertLayer.cpp @@ -21,18 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/runtime/NEON/functions/NEDepthConvert.h" +#include "arm_compute/runtime/NEON/functions/NEDepthConvertLayer.h" -#include "arm_compute/core/NEON/kernels/NEDepthConvertKernel.h" +#include "arm_compute/core/NEON/kernels/NEDepthConvertLayerKernel.h" #include "support/ToolchainSupport.h" #include <utility> using namespace arm_compute; -void NEDepthConvert::configure(ITensor *input, ITensor *output, ConvertPolicy policy, uint32_t shift) +void NEDepthConvertLayer::configure(ITensor *input, ITensor *output, ConvertPolicy policy, uint32_t shift) { - auto k = arm_compute::support::cpp14::make_unique<NEDepthConvertKernel>(); + auto k = arm_compute::support::cpp14::make_unique<NEDepthConvertLayerKernel>(); k->configure(input, output, policy, shift); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEDepthwiseConvolution.cpp b/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp index e12bc07464..b890c6f5d5 100644 --- a/src/runtime/NEON/functions/NEDepthwiseConvolution.cpp +++ b/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.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/runtime/NEON/functions/NEDepthwiseConvolution.h" +#include "arm_compute/runtime/NEON/functions/NEDepthwiseConvolutionLayer.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/ITensor.h" @@ -31,12 +31,12 @@ using namespace arm_compute; -NEDepthwiseConvolution3x3::NEDepthwiseConvolution3x3() +NEDepthwiseConvolutionLayer3x3::NEDepthwiseConvolutionLayer3x3() : _kernel(), _bias_kernel(), _border_handler(), _has_bias(false) { } -void NEDepthwiseConvolution3x3::configure(ITensor *input, const ITensor *weights, const ITensor *biases, ITensor *output, const PadStrideInfo &conv_info) +void NEDepthwiseConvolutionLayer3x3::configure(ITensor *input, const ITensor *weights, const ITensor *biases, 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); @@ -51,7 +51,7 @@ void NEDepthwiseConvolution3x3::configure(ITensor *input, const ITensor *weights } } -void NEDepthwiseConvolution3x3::run() +void NEDepthwiseConvolutionLayer3x3::run() { NEScheduler::get().schedule(&_border_handler, Window::DimX); NEScheduler::get().schedule(&_kernel, Window::DimX); @@ -61,12 +61,12 @@ void NEDepthwiseConvolution3x3::run() } } -NEDepthwiseConvolution::NEDepthwiseConvolution() +NEDepthwiseConvolutionLayer::NEDepthwiseConvolutionLayer() : _im2col_kernel(), _weights_reshape_kernel(), _v2mm_kernel(), _vector_to_tensor_kernel(), _input_reshaped(), _weights_reshaped(), _v2mm_output() { } -void NEDepthwiseConvolution::configure(ITensor *input, const ITensor *weights, const ITensor *biases, ITensor *output, const PadStrideInfo &conv_info) +void NEDepthwiseConvolutionLayer::configure(ITensor *input, const ITensor *weights, const ITensor *biases, 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, weights); @@ -117,7 +117,7 @@ void NEDepthwiseConvolution::configure(ITensor *input, const ITensor *weights, c _v2mm_output.allocator()->allocate(); } -void NEDepthwiseConvolution::run() +void NEDepthwiseConvolutionLayer::run() { NEScheduler::get().schedule(&_im2col_kernel, Window::DimX); NEScheduler::get().schedule(&_weights_reshape_kernel, Window::DimX); diff --git a/src/runtime/NEON/functions/NEL2Normalize.cpp b/src/runtime/NEON/functions/NEL2NormalizeLayer.cpp index 349a781b0b..fa62483146 100644 --- a/src/runtime/NEON/functions/NEL2Normalize.cpp +++ b/src/runtime/NEON/functions/NEL2NormalizeLayer.cpp @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "arm_compute/runtime/NEON/functions/NEL2Normalize.h" +#include "arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/runtime/NEON/NEScheduler.h" using namespace arm_compute; -NEL2Normalize::NEL2Normalize(std::shared_ptr<IMemoryManager> memory_manager) +NEL2NormalizeLayer::NEL2NormalizeLayer(std::shared_ptr<IMemoryManager> memory_manager) : _memory_group(std::move(memory_manager)), _reduce_func(), _normalize_kernel(), _sumsq() { } -void NEL2Normalize::configure(ITensor *input, ITensor *output, unsigned int axis, float epsilon) +void NEL2NormalizeLayer::configure(ITensor *input, ITensor *output, unsigned int axis, float epsilon) { // Manage intermediate buffers _memory_group.manage(&_sumsq); @@ -46,7 +46,7 @@ void NEL2Normalize::configure(ITensor *input, ITensor *output, unsigned int axis _sumsq.allocator()->allocate(); } -void NEL2Normalize::run() +void NEL2NormalizeLayer::run() { _memory_group.acquire(); diff --git a/src/runtime/NEON/functions/NELaplacianPyramid.cpp b/src/runtime/NEON/functions/NELaplacianPyramid.cpp index a680f1f11d..0e149d4176 100644 --- a/src/runtime/NEON/functions/NELaplacianPyramid.cpp +++ b/src/runtime/NEON/functions/NELaplacianPyramid.cpp @@ -28,7 +28,7 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h" -#include "arm_compute/runtime/NEON/functions/NEDepthConvert.h" +#include "arm_compute/runtime/NEON/functions/NEDepthConvertLayer.h" #include "arm_compute/runtime/NEON/functions/NEGaussian5x5.h" #include "arm_compute/runtime/NEON/functions/NEGaussianPyramid.h" #include "arm_compute/runtime/Tensor.h" |