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/runtime/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/runtime/NEON')
-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 |
5 files changed, 21 insertions, 21 deletions
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" |