diff options
author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2019-07-26 15:31:02 +0100 |
---|---|---|
committer | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2019-07-29 12:29:07 +0000 |
commit | bd9097db81f229c2d7bbafc2bcf392b7c1c49b58 (patch) | |
tree | b86cda1c686e4466ce7927b66aba15e49b0c6139 /src | |
parent | 44f5572f3d6ba8e39c4a18a991049992d590ce39 (diff) | |
download | ComputeLibrary-bd9097db81f229c2d7bbafc2bcf392b7c1c49b58.tar.gz |
COMPMID-2336: Rename the new generic depthwise convolution on NEON
Change-Id: I45cacf75b08bb9d867343037507e56f200ad6ac0
Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1637
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.cpp (renamed from src/core/NEON/kernels/NEDepthwiseConvolutionLayerKernel.cpp) | 22 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/core/NEON/kernels/NEDepthwiseConvolutionLayerKernel.cpp b/src/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.cpp index feb2071d47..aafdb2e8a4 100644 --- a/src/core/NEON/kernels/NEDepthwiseConvolutionLayerKernel.cpp +++ b/src/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.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/NEDepthwiseConvolutionLayerKernel.h" +#include "arm_compute/core/NEON/kernels/NEDepthwiseConvolutionLayerNativeKernel.h" #include "arm_compute/core/AccessWindowStatic.h" #include "arm_compute/core/NEON/wrapper/traits.h" @@ -252,18 +252,18 @@ std::pair<Status, Window> validate_and_configure_window(ITensorInfo *input, ITen return std::make_pair(err, win); } -NEDepthwiseConvolutionLayerKernel::NEDepthwiseConvolutionLayerKernel() +NEDepthwiseConvolutionLayerNativeKernel::NEDepthwiseConvolutionLayerNativeKernel() : _func(), _border_size(0), _input(), _weights(), _biases(), _output(), _conv_info(), _depth_multiplier(1), _dilation() { } -BorderSize NEDepthwiseConvolutionLayerKernel::border_size() const +BorderSize NEDepthwiseConvolutionLayerNativeKernel::border_size() const { return _border_size; } -void NEDepthwiseConvolutionLayerKernel::configure(const ITensor *input, const ITensor *weights, const ITensor *biases, ITensor *output, - const PadStrideInfo &conv_info, unsigned int depth_multiplier, const Size2D &dilation) +void NEDepthwiseConvolutionLayerNativeKernel::configure(const ITensor *input, const ITensor *weights, const ITensor *biases, ITensor *output, + const PadStrideInfo &conv_info, unsigned int depth_multiplier, const Size2D &dilation) { ARM_COMPUTE_ERROR_ON_NULLPTR(input, weights, output); ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(input->info(), weights->info(), (biases != nullptr) ? biases->info() : nullptr, output->info(), conv_info, depth_multiplier, dilation)); @@ -280,7 +280,7 @@ void NEDepthwiseConvolutionLayerKernel::configure(const ITensor *input, const IT switch(_input->info()->data_type()) { case DataType::F32: - _func = (biases != nullptr) ? &NEDepthwiseConvolutionLayerKernel::run_depthwise<float, 2, true> : &NEDepthwiseConvolutionLayerKernel::run_depthwise<float, 2, false>; + _func = (biases != nullptr) ? &NEDepthwiseConvolutionLayerNativeKernel::run_depthwise<float, 2, true> : &NEDepthwiseConvolutionLayerNativeKernel::run_depthwise<float, 2, false>; break; default: ARM_COMPUTE_ERROR("Data type not supported"); @@ -292,9 +292,9 @@ void NEDepthwiseConvolutionLayerKernel::configure(const ITensor *input, const IT INEKernel::configure(win_config.second); } -Status NEDepthwiseConvolutionLayerKernel::validate(const ITensorInfo *input, const ITensorInfo *weights, const ITensorInfo *biases, const ITensorInfo *output, const PadStrideInfo &conv_info, - unsigned int depth_multiplier, - const Size2D &dilation) +Status NEDepthwiseConvolutionLayerNativeKernel::validate(const ITensorInfo *input, const ITensorInfo *weights, const ITensorInfo *biases, const ITensorInfo *output, const PadStrideInfo &conv_info, + unsigned int depth_multiplier, + const Size2D &dilation) { ARM_COMPUTE_RETURN_ON_ERROR(validate_arguments(input, weights, biases, output, conv_info, depth_multiplier, dilation)); ARM_COMPUTE_RETURN_ON_ERROR(validate_and_configure_window(input->clone().get(), weights->clone().get(), (biases != nullptr) ? biases->clone().get() : nullptr, output->clone().get(), conv_info, @@ -303,7 +303,7 @@ Status NEDepthwiseConvolutionLayerKernel::validate(const ITensorInfo *input, con return Status{}; } -void NEDepthwiseConvolutionLayerKernel::run(const Window &window, const ThreadInfo &info) +void NEDepthwiseConvolutionLayerNativeKernel::run(const Window &window, const ThreadInfo &info) { ARM_COMPUTE_UNUSED(info); ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); @@ -313,7 +313,7 @@ void NEDepthwiseConvolutionLayerKernel::run(const Window &window, const ThreadIn } template <typename T, int S, bool has_biases> -void NEDepthwiseConvolutionLayerKernel::run_depthwise(const Window &window) +void NEDepthwiseConvolutionLayerNativeKernel::run_depthwise(const Window &window) { ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(INEKernel::window(), window); diff --git a/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp b/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp index c2ed901169..cdd278b2f1 100644 --- a/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp @@ -947,7 +947,7 @@ Status NEDepthwiseConvolutionLayer::validate(const ITensorInfo *input, const ITe } else { - ARM_COMPUTE_RETURN_ON_ERROR(NEDepthwiseConvolutionLayerKernel::validate(input, weights, biases, output, conv_info, depth_multiplier, dilation)); + ARM_COMPUTE_RETURN_ON_ERROR(NEDepthwiseConvolutionLayerNativeKernel::validate(input, weights, biases, output, conv_info, depth_multiplier, dilation)); } // Validate Activation Layer |