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/core/NEON | |
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/core/NEON')
-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 |
4 files changed, 18 insertions, 18 deletions
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); |