diff options
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/NEFunctions.h | 4 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/functions/NECol2Im.h | 61 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h | 49 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h | 72 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEIm2Col.h | 97 | ||||
-rw-r--r-- | docs/00_introduction.dox | 8 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NECol2Im.cpp | 41 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp | 36 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp | 44 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEIm2Col.cpp | 57 | ||||
-rw-r--r-- | tests/validation/NEON/Col2Im.cpp | 7 | ||||
-rw-r--r-- | tests/validation/NEON/Im2Col.cpp | 7 |
13 files changed, 16 insertions, 471 deletions
diff --git a/Android.bp b/Android.bp index 8c29386a28..93ab684fc2 100644 --- a/Android.bp +++ b/Android.bp @@ -638,7 +638,6 @@ cc_library_static { "src/runtime/NEON/functions/NEChannelCombine.cpp", "src/runtime/NEON/functions/NEChannelExtract.cpp", "src/runtime/NEON/functions/NEChannelShuffleLayer.cpp", - "src/runtime/NEON/functions/NECol2Im.cpp", "src/runtime/NEON/functions/NEColorConvert.cpp", "src/runtime/NEON/functions/NEComputeAllAnchors.cpp", "src/runtime/NEON/functions/NEConcatenateLayer.cpp", @@ -674,10 +673,8 @@ cc_library_static { "src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp", "src/runtime/NEON/functions/NEGEMMConv2d.cpp", "src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp", - "src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp", "src/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.cpp", "src/runtime/NEON/functions/NEGEMMLowpOutputStage.cpp", - "src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp", "src/runtime/NEON/functions/NEGather.cpp", "src/runtime/NEON/functions/NEGaussian3x3.cpp", "src/runtime/NEON/functions/NEGaussian5x5.cpp", @@ -689,7 +686,6 @@ cc_library_static { "src/runtime/NEON/functions/NEHOGMultiDetection.cpp", "src/runtime/NEON/functions/NEHarrisCorners.cpp", "src/runtime/NEON/functions/NEHistogram.cpp", - "src/runtime/NEON/functions/NEIm2Col.cpp", "src/runtime/NEON/functions/NEInstanceNormalizationLayer.cpp", "src/runtime/NEON/functions/NEIntegralImage.cpp", "src/runtime/NEON/functions/NEL2NormalizeLayer.cpp", diff --git a/arm_compute/runtime/NEON/NEFunctions.h b/arm_compute/runtime/NEON/NEFunctions.h index e25b03d915..694ebb4a17 100644 --- a/arm_compute/runtime/NEON/NEFunctions.h +++ b/arm_compute/runtime/NEON/NEFunctions.h @@ -44,7 +44,6 @@ #include "arm_compute/runtime/NEON/functions/NEChannelCombine.h" #include "arm_compute/runtime/NEON/functions/NEChannelExtract.h" #include "arm_compute/runtime/NEON/functions/NEChannelShuffleLayer.h" -#include "arm_compute/runtime/NEON/functions/NECol2Im.h" #include "arm_compute/runtime/NEON/functions/NEColorConvert.h" #include "arm_compute/runtime/NEON/functions/NEComputeAllAnchors.h" #include "arm_compute/runtime/NEON/functions/NEConcatenateLayer.h" @@ -80,10 +79,8 @@ #include "arm_compute/runtime/NEON/functions/NEGEMMAssemblyDispatch.h" #include "arm_compute/runtime/NEON/functions/NEGEMMConv2d.h" #include "arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h" -#include "arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h" #include "arm_compute/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.h" #include "arm_compute/runtime/NEON/functions/NEGEMMLowpOutputStage.h" -#include "arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h" #include "arm_compute/runtime/NEON/functions/NEGather.h" #include "arm_compute/runtime/NEON/functions/NEGaussian3x3.h" #include "arm_compute/runtime/NEON/functions/NEGaussian5x5.h" @@ -95,7 +92,6 @@ #include "arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h" #include "arm_compute/runtime/NEON/functions/NEHarrisCorners.h" #include "arm_compute/runtime/NEON/functions/NEHistogram.h" -#include "arm_compute/runtime/NEON/functions/NEIm2Col.h" #include "arm_compute/runtime/NEON/functions/NEInstanceNormalizationLayer.h" #include "arm_compute/runtime/NEON/functions/NEIntegralImage.h" #include "arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h" diff --git a/arm_compute/runtime/NEON/functions/NECol2Im.h b/arm_compute/runtime/NEON/functions/NECol2Im.h deleted file mode 100644 index 69459a83c1..0000000000 --- a/arm_compute/runtime/NEON/functions/NECol2Im.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2017-2020 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. - */ -#ifndef ARM_COMPUTE_NECOL2IM_H -#define ARM_COMPUTE_NECOL2IM_H - -#include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h" - -#include "arm_compute/core/Error.h" -#include "arm_compute/core/Size2D.h" - -namespace arm_compute -{ -class ITensor; -class ITensorInfo; - -/** Basic function to run @ref NECol2Im */ -class NECol2Im : public INESimpleFunctionNoBorder -{ -public: - /** Configure the col2im NEON kernel - * - * @param[in] input The input tensor to convert. Data types supported: All - * @param[out] output The output tensor. 3 lower dimensions represent a single output [width, height, OFM], - * while the rest represent batch of outputs. Data types supported: Same as @p input - * @param[in] convolved_dims Output convolved dimensions. - */ - void configure(const ITensor *input, ITensor *output, const Size2D &convolved_dims); - /** Static function to check if given info will lead to a valid configuration of @ref NECol2Im - * - * @param[in] input The input tensor to convert. Data types supported: All - * @param[in] output The output tensor. 3 lower dimensions represent a single output [width, height, OFM], - * while the rest represent batch of outputs. Data types supported: Same as @p input - * @param[in] convolved_dims Output convolved dimensions. - * - * @return a status - */ - static Status validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &convolved_dims); -}; -} // namespace arm_compute -#endif /* ARM_COMPUTE_NECOL2IM_H */ diff --git a/arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h b/arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h deleted file mode 100644 index 7195c71063..0000000000 --- a/arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2017-2020 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. - */ -#ifndef ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H -#define ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H - -#include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h" - -namespace arm_compute -{ -class ITensor; - -/** Basic function to execute NEGEMMInterleave4x4Kernel. This function calls the following NEON kernel: - * - * -# @ref NEGEMMInterleave4x4Kernel - * - */ -class NEGEMMInterleave4x4 : public INESimpleFunctionNoBorder -{ -public: - /** Initialise the kernel's inputs, output - * - * @param[in] input First input tensor. Data types supported: All - * @param[out] output Output tensor. Data type supported: same as @p input - */ - void configure(const ITensor *input, ITensor *output); -}; -} // namespace arm_compute -#endif /*ARM_COMPUTE_NEGEMMINTERLEAVE4X4_H */ diff --git a/arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h b/arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h deleted file mode 100644 index 723a638d76..0000000000 --- a/arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2017-2020 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. - */ -#ifndef ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H -#define ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H - -#include "arm_compute/core/Error.h" -#include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h" - -namespace arm_compute -{ -// Forward declarations -class ITensor; -class ITensorInfo; - -/** Basic function to execute NEGEMMTranspose1xWKernel. This function calls the following NEON kernels: - * - * -# @ref NEGEMMTranspose1xWKernel - * - */ -class NEGEMMTranspose1xW : public INESimpleFunctionNoBorder -{ -public: - /** Constructor */ - NEGEMMTranspose1xW() = default; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - NEGEMMTranspose1xW(const NEGEMMTranspose1xW &) = delete; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - NEGEMMTranspose1xW &operator=(const NEGEMMTranspose1xW &) = delete; - /** Prevent instances of this class from being moved (As this class contains non movable objects) */ - NEGEMMTranspose1xW(NEGEMMTranspose1xW &&) = delete; - /** Prevent instances of this class from being moved (As this class contains non movable objects) */ - NEGEMMTranspose1xW &operator=(NEGEMMTranspose1xW &&) = delete; - /** Default destructor */ - ~NEGEMMTranspose1xW() = default; - /** Initialise the kernel's inputs, output - * - * @param[in] input First input tensor. Data type supported: All - * @param[out] output Output tensor. Data type supported: same as @p input - */ - void configure(const ITensor *input, ITensor *output); - /** Static function to check if given info will lead to a valid configuration of @ref NEGEMMTranspose1xW - * - * @param[in] input First input tensor. Data type supported: All - * @param[in] output Output tensor. Data type supported: same as @p input - * - * @return a status - */ - static Status validate(const ITensorInfo *input, const ITensorInfo *output); -}; -} // namespace arm_compute -#endif /*ARM_COMPUTE_NEGEMMTRANSPOSE1XW_H */ diff --git a/arm_compute/runtime/NEON/functions/NEIm2Col.h b/arm_compute/runtime/NEON/functions/NEIm2Col.h deleted file mode 100644 index 2f023f44fe..0000000000 --- a/arm_compute/runtime/NEON/functions/NEIm2Col.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2017-2020 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. - */ -#ifndef ARM_COMPUTE_NEIM2COL_H -#define ARM_COMPUTE_NEIM2COL_H - -#include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h" - -#include "arm_compute/core/Size2D.h" -#include "arm_compute/core/Types.h" -#include <memory> - -namespace arm_compute -{ -// Forward declarations -class ITensor; -class ITensorInfo; -class NEIm2ColKernel; - -/** Basic function to run @ref NEIm2ColKernel */ -class NEIm2Col : public IFunction -{ -public: - /** Default constructor */ - NEIm2Col(); - /** Prevent instances of this class from being copied (As this class contains pointers) */ - NEIm2Col(const NEIm2Col &) = delete; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - NEIm2Col &operator=(const NEIm2Col &) = delete; - /** Prevent instances of this class from being moved (As this class contains non movable objects) */ - NEIm2Col(NEIm2Col &&) = delete; - /** Prevent instances of this class from being moved (As this class contains non movable objects) */ - NEIm2Col &operator=(NEIm2Col &&) = delete; - /** Default destructor */ - ~NEIm2Col(); - /** Configure the im2col NEON kernel - * - * @param[in] input The input tensor to convert. 3 lower dimensions represent a single input [width, height, IFM], - * while every optional dimension from 4 and above represent a batch of inputs. - * Data types supported: QASYMM8/QASYMM8_SIGNED/BFLOAT16/F16/F32 - * Note: QASYMM8/QASYMM8_SIGNED works only for has_bias = false - * @param[out] output The output tensor. Data types supported: Same as @p input - * @param[in] kernel_dims The kernel dimensions (width and height). - * @param[in] conv_info Contains padding and stride information described in @ref PadStrideInfo. - * @param[in] has_bias In case biases are provided expands the matrix with 1. - * @param[in] dilation (Optional) Dilation, in elements, across x and y. Defaults to (1, 1). - * @param[in] num_groups (Optional) Number of groups when performing a grouped convolution - */ - void configure(const ITensor *input, ITensor *output, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, const Size2D &dilation = Size2D(1U, 1U), - unsigned int num_groups = 1); - /** Static function to check if given info will lead to a valid configuration of @ref NEIm2Col - * - * @param[in] input The input tensor to convert. 3 lower dimensions represent a single input [width, height, IFM], - * while every optional dimension from 4 and above represent a batch of inputs. - * Data types supported: QASYMM8/QASYMM8_SIGNED/BFLOAT16/F16/F32 - * Note: QASYMM8/QASYMM8_SIGNED works only for has_bias = false - * @param[in] output The output tensor. Data types supported: Same as @p input - * @param[in] kernel_dims The kernel dimensions (width and height). - * @param[in] conv_info Contains padding and stride information described in @ref PadStrideInfo. - * @param[in] has_bias In case biases are provided expands the matrix with 1. - * @param[in] dilation (Optional) Dilation, in elements, across x and y. Defaults to (1, 1). - * @param[in] num_groups (Optional) Number of groups when performing a grouped convolution - * - * @return a status - */ - static Status validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, const Size2D &dilation = Size2D(1U, 1U), - unsigned int num_groups = 1); - - // Inherited methods overridden: - void run() override; - -private: - std::unique_ptr<NEIm2ColKernel> _kernel; - unsigned int _y_dim; -}; -} // namespace arm_compute -#endif /* ARM_COMPUTE_NEIM2COL_H */ diff --git a/docs/00_introduction.dox b/docs/00_introduction.dox index 49ccbce5c3..4b1819acce 100644 --- a/docs/00_introduction.dox +++ b/docs/00_introduction.dox @@ -90,6 +90,10 @@ v21.02 Public major release - Upgraded C++ standard to C++14 - Removed functions: - NELocallyConnectedLayer / CLLocallyConnectedLayer + - NEIm2Col + - NECol2Im + - NEGEMMInterleave4x4 + - NEGEMMTranspose1xW - Remove kernels: - NEGEMMMatrixVectorMultiplyKernel - NELocallyConnectedMatrixMultiplyKernel / CLLocallyConnectedMatrixMultiplyKernel @@ -477,7 +481,7 @@ v20.05 Public major release - @ref NEWeightsReshapeKernel - @ref NEConvolutionLayerReshapeWeights - @ref NEIm2ColKernel - - @ref NEIm2Col + - NEIm2Col - @ref NEDepthConvertLayerKernel - @ref NEDepthConvertLayer - @ref NEGEMMConvolutionLayer @@ -984,7 +988,7 @@ v18.05 Public major release - @ref NEBatchNormalizationLayer / @ref CLBatchNormalizationLayer - @ref NEDepthwiseConvolutionLayer - @ref NEScale - - @ref NEIm2Col + - NEIm2Col - Added support for dilated convolutions in @ref NEConvolutionLayer and @ref CLConvolutionLayer. - New OpenCL kernels / functions: - @ref CLChannelShuffleLayer / @ref CLChannelShuffleLayerKernel diff --git a/src/runtime/NEON/functions/NECol2Im.cpp b/src/runtime/NEON/functions/NECol2Im.cpp deleted file mode 100644 index fc61520f47..0000000000 --- a/src/runtime/NEON/functions/NECol2Im.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2017-2020 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/NECol2Im.h" - -#include "src/core/NEON/kernels/NECol2ImKernel.h" - -namespace arm_compute -{ -void NECol2Im::configure(const ITensor *input, ITensor *output, const Size2D &convolved_dims) -{ - auto k = std::make_unique<NECol2ImKernel>(); - k->configure(input, output, convolved_dims); - _kernel = std::move(k); -} - -Status NECol2Im::validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &convolved_dims) -{ - return NECol2ImKernel::validate(input, output, convolved_dims); -} -} // namespace arm_compute diff --git a/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp b/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp deleted file mode 100644 index 1e7a34bb35..0000000000 --- a/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2017-2020 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/NEGEMMInterleave4x4.h" - -#include "src/core/NEON/kernels/NEGEMMInterleave4x4Kernel.h" - -namespace arm_compute -{ -void NEGEMMInterleave4x4::configure(const ITensor *input, ITensor *output) -{ - auto k = std::make_unique<NEGEMMInterleave4x4Kernel>(); - k->configure(input, output); - _kernel = std::move(k); -} -} // namespace arm_compute diff --git a/src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp b/src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp deleted file mode 100644 index 0408cfa585..0000000000 --- a/src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2017-2020 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/NEGEMMTranspose1xW.h" - -#include "arm_compute/core/Error.h" -#include "arm_compute/core/ITensor.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/core/Validate.h" -#include "src/core/NEON/kernels/NEGEMMTranspose1xWKernel.h" - -namespace arm_compute -{ -void NEGEMMTranspose1xW::configure(const ITensor *input, ITensor *output) -{ - auto k = std::make_unique<NEGEMMTranspose1xWKernel>(); - k->configure(input, output); - _kernel = std::move(k); -} -Status NEGEMMTranspose1xW::validate(const ITensorInfo *input, const ITensorInfo *output) -{ - return NEGEMMTranspose1xWKernel::validate(input, output); -} -} // namespace arm_compute diff --git a/src/runtime/NEON/functions/NEIm2Col.cpp b/src/runtime/NEON/functions/NEIm2Col.cpp deleted file mode 100644 index d6d72aa712..0000000000 --- a/src/runtime/NEON/functions/NEIm2Col.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2017-2020 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/NEIm2Col.h" - -#include "arm_compute/core/TensorInfo.h" -#include "arm_compute/runtime/NEON/NEScheduler.h" -#include "src/core/NEON/kernels/NEIm2ColKernel.h" - -namespace arm_compute -{ -NEIm2Col::~NEIm2Col() = default; - -NEIm2Col::NEIm2Col() - : _kernel(), _y_dim(1) -{ -} - -void NEIm2Col::configure(const ITensor *input, ITensor *output, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, const Size2D &dilation, unsigned int num_groups) -{ - _y_dim = get_data_layout_dimension_index(input->info()->data_layout(), DataLayoutDimension::HEIGHT); - - _kernel = std::make_unique<NEIm2ColKernel>(); - _kernel->configure(input, output, kernel_dims, conv_info, has_bias, dilation, num_groups); -} - -Status NEIm2Col::validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, const Size2D &dilation, - unsigned int num_groups) -{ - return NEIm2ColKernel::validate(input, output, kernel_dims, conv_info, has_bias, dilation, num_groups); -} - -void NEIm2Col::run() -{ - NEScheduler::get().schedule(_kernel.get(), _y_dim); -} -} // namespace arm_compute diff --git a/tests/validation/NEON/Col2Im.cpp b/tests/validation/NEON/Col2Im.cpp index 5f98b455d9..9139f0cca8 100644 --- a/tests/validation/NEON/Col2Im.cpp +++ b/tests/validation/NEON/Col2Im.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Arm Limited. + * Copyright (c) 2017-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -22,7 +22,8 @@ * SOFTWARE. */ #include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/functions/NECol2Im.h" +#include "src/core/NEON/kernels/NECol2ImKernel.h" +#include "tests/NEON/Helper.h" #include "tests/datasets/ShapeDatasets.h" #include "tests/framework/Asserts.h" #include "tests/framework/Macros.h" @@ -38,6 +39,8 @@ namespace validation TEST_SUITE(NEON) TEST_SUITE(Col2Im) +using NECol2Im = NESynthetizeFunction<NECol2ImKernel>; + // *INDENT-OFF* // clang-format off DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip( diff --git a/tests/validation/NEON/Im2Col.cpp b/tests/validation/NEON/Im2Col.cpp index d218956884..4c1bb80a50 100644 --- a/tests/validation/NEON/Im2Col.cpp +++ b/tests/validation/NEON/Im2Col.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Arm Limited. + * Copyright (c) 2017-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -22,8 +22,9 @@ * SOFTWARE. */ #include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/functions/NEIm2Col.h" +#include "src/core/NEON/kernels/NEIm2ColKernel.h" #include "tests/NEON/Accessor.h" +#include "tests/NEON/Helper.h" #include "tests/datasets/ShapeDatasets.h" #include "tests/framework/Asserts.h" #include "tests/framework/Macros.h" @@ -54,6 +55,8 @@ const auto conv_args_small = combine(combine(combine(combine(conv_filter TEST_SUITE(NEON) TEST_SUITE(Im2Col) +using NEIm2Col = NESynthetizeFunction<NEIm2ColKernel>; + // *INDENT-OFF* // clang-format off DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( |