From 70e890e45c4adc69963240b0ca8c2016566d8c18 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Mon, 5 Aug 2019 14:00:35 +0100 Subject: COMPMID-2541 Remove DepthwiseSeparableConvolutionLayer for NEON/CL Change-Id: I16750617fa9e1e97c6e3671e69965dcf3f4a086f Signed-off-by: Giorgio Arena Reviewed-on: https://review.mlplatform.org/c/1748 Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- .../CLDepthwiseSeparableConvolutionLayer.cpp | 58 ---------------------- .../NEDepthwiseSeparableConvolutionLayer.cpp | 58 ---------------------- 2 files changed, 116 deletions(-) delete mode 100644 src/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.cpp delete mode 100644 src/runtime/NEON/functions/NEDepthwiseSeparableConvolutionLayer.cpp (limited to 'src') diff --git a/src/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.cpp b/src/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.cpp deleted file mode 100644 index fa2c3affa3..0000000000 --- a/src/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2017-2018 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.h" - -#include "arm_compute/core/CL/ICLTensor.h" -#include "arm_compute/core/PixelValue.h" -#include "arm_compute/runtime/CL/CLScheduler.h" -#include "support/ToolchainSupport.h" - -using namespace arm_compute; - -CLDepthwiseSeparableConvolutionLayer::CLDepthwiseSeparableConvolutionLayer() - : _depthwise_conv(), _pointwise_conv() -{ -} - -void CLDepthwiseSeparableConvolutionLayer::configure(ICLTensor *input, const ICLTensor *depthwise_weights, const ICLTensor *depthwise_biases, ICLTensor *depthwise_out, - const ICLTensor *pointwise_weights, const ICLTensor *pointwise_biases, ICLTensor *output, - const PadStrideInfo &depthwise_conv_info, const PadStrideInfo &pointwise_conv_info) -{ - _depthwise_conv.configure(input, depthwise_weights, depthwise_biases, depthwise_out, depthwise_conv_info); - _pointwise_conv.configure(depthwise_out, pointwise_weights, pointwise_biases, output, pointwise_conv_info); -} - -void CLDepthwiseSeparableConvolutionLayer::run() -{ - prepare(); - - _depthwise_conv.run(); - _pointwise_conv.run(); -} - -void CLDepthwiseSeparableConvolutionLayer::prepare() -{ - _depthwise_conv.prepare(); - _pointwise_conv.prepare(); -} \ No newline at end of file diff --git a/src/runtime/NEON/functions/NEDepthwiseSeparableConvolutionLayer.cpp b/src/runtime/NEON/functions/NEDepthwiseSeparableConvolutionLayer.cpp deleted file mode 100644 index da2e49c730..0000000000 --- a/src/runtime/NEON/functions/NEDepthwiseSeparableConvolutionLayer.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2017-2018 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/runtime/NEON/functions/NEDepthwiseSeparableConvolutionLayer.h" - -#include "arm_compute/core/ITensor.h" -#include "arm_compute/core/PixelValue.h" -#include "arm_compute/runtime/NEON/NEScheduler.h" -#include "support/ToolchainSupport.h" - -using namespace arm_compute; - -NEDepthwiseSeparableConvolutionLayer::NEDepthwiseSeparableConvolutionLayer() - : _depthwise_conv(), _pointwise_conv() -{ -} - -void NEDepthwiseSeparableConvolutionLayer::configure(ITensor *input, const ITensor *depthwise_weights, const ITensor *depthwise_biases, ITensor *depthwise_out, - const ITensor *pointwise_weights, const ITensor *pointwise_biases, ITensor *output, - const PadStrideInfo &depthwise_conv_info, const PadStrideInfo &pointwise_conv_info) -{ - _depthwise_conv.configure(input, depthwise_weights, depthwise_biases, depthwise_out, depthwise_conv_info); - _pointwise_conv.configure(depthwise_out, pointwise_weights, pointwise_biases, output, pointwise_conv_info); -} - -void NEDepthwiseSeparableConvolutionLayer::run() -{ - prepare(); - - _depthwise_conv.run(); - _pointwise_conv.run(); -} - -void NEDepthwiseSeparableConvolutionLayer::prepare() -{ - _depthwise_conv.prepare(); - _pointwise_conv.prepare(); -} \ No newline at end of file -- cgit v1.2.1