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/CL | |
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/CL')
-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 |
5 files changed, 22 insertions, 22 deletions
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" |