diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-12-03 14:38:33 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-12-07 16:10:51 +0000 |
commit | f7c5a41aebf8951ef783aa3d45f0bc4e98656e7b (patch) | |
tree | 9ca3e8eb7a587956c5816dc4dd268f001e4bfaa3 /src/runtime/NEON | |
parent | e5a9ad8c81c9cf245011839fa373f3603d719ba8 (diff) | |
download | ComputeLibrary-f7c5a41aebf8951ef783aa3d45f0bc4e98656e7b.tar.gz |
Remove support for NEIm2Col, NECol2Im, NEGEMMInterleave4x4, NEGEMMTranspose1xW
Remove functions that are rarely used standalone.
Moreover, similar OpenCL functions are not exposed, thus there is no
parity in place.
Partially Resolves: COMPMID-3996
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Idd124c27c37dae9cbcfec1b6453d451cc9d4ef53
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4649
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/NEON')
-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 |
4 files changed, 0 insertions, 178 deletions
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 |