From 473cb01e84cef6cab057e9492bfa3b68f708e5d7 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Tue, 23 Feb 2021 11:48:12 +0000 Subject: Remove Compute Vision CL support Resolves COMPMID-4151 Change-Id: I46f541efe8c4087f27794d2e158b6c1547d459ba Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5160 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- arm_compute/runtime/CL/functions/CLCannyEdge.h | 114 ------------------------- 1 file changed, 114 deletions(-) delete mode 100644 arm_compute/runtime/CL/functions/CLCannyEdge.h (limited to 'arm_compute/runtime/CL/functions/CLCannyEdge.h') diff --git a/arm_compute/runtime/CL/functions/CLCannyEdge.h b/arm_compute/runtime/CL/functions/CLCannyEdge.h deleted file mode 100644 index 1c48d690a5..0000000000 --- a/arm_compute/runtime/CL/functions/CLCannyEdge.h +++ /dev/null @@ -1,114 +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_CLCANNYEDGE_H -#define ARM_COMPUTE_CLCANNYEDGE_H - -#include "arm_compute/runtime/IFunction.h" - -#include "arm_compute/runtime/CL/CLTensor.h" -#include "arm_compute/runtime/IMemoryManager.h" -#include "arm_compute/runtime/MemoryGroup.h" - -#include - -namespace arm_compute -{ -class CLCompileContext; -class CLFillBorderKernel; -class CLGradientKernel; -class CLEdgeNonMaxSuppressionKernel; -class CLEdgeTraceKernel; -class ICLTensor; - -/** Basic function to execute canny edge on OpenCL. This function calls the following OpenCL kernels and functions: - * - * -# @ref CLFillBorderKernel (if border_mode == REPLICATE or border_mode == CONSTANT) - * -# @ref CLSobel3x3 (if gradient_size == 3) or @ref CLSobel5x5 (if gradient_size == 5) or @ref CLSobel7x7 (if gradient_size == 7) - * -# @ref CLGradientKernel - * -# @ref CLEdgeNonMaxSuppressionKernel - * -# @ref CLEdgeTraceKernel - * - * @deprecated This function is deprecated and is intended to be removed in 21.05 release - * - */ -class CLCannyEdge : public IFunction -{ -public: - /** Constructor */ - CLCannyEdge(std::shared_ptr memory_manager = nullptr); - /** Prevent instances of this class from being copied (As this class contains pointers) */ - CLCannyEdge(const CLCannyEdge &) = delete; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - CLCannyEdge &operator=(const CLCannyEdge &) = delete; - /** Default destructor */ - ~CLCannyEdge(); - /** Initialise the function's source, destination, thresholds, gradient size, normalization type and border mode. - * - * @param[in,out] input Source tensor. Data types supported: U8. (Written to only for border_mode != UNDEFINED) - * @param[out] output Destination tensor. Data types supported: U8. - * @param[in] upper_thr Upper threshold used for the hysteresis. - * @param[in] lower_thr Lower threshold used for the hysteresis. - * @param[in] gradient_size Gradient size (3, 5 or 7). - * @param[in] norm_type Normalization type. if 1, L1-Norm otherwise L2-Norm. - * @param[in] border_mode Border mode to use for the convolution. - * @param[in] constant_border_value (Optional) Constant value to use for borders if border_mode is set to CONSTANT. - */ - void configure(ICLTensor *input, ICLTensor *output, int32_t upper_thr, int32_t lower_thr, int32_t gradient_size, int32_t norm_type, BorderMode border_mode, - uint8_t constant_border_value = 0); - /** Initialise the function's source, destination, thresholds, gradient size, normalization type and border mode. - * - * @param[in] compile_context The compile context to be used. - * @param[in,out] input Source tensor. Data types supported: U8. (Written to only for border_mode != UNDEFINED) - * @param[out] output Destination tensor. Data types supported: U8. - * @param[in] upper_thr Upper threshold used for the hysteresis. - * @param[in] lower_thr Lower threshold used for the hysteresis. - * @param[in] gradient_size Gradient size (3, 5 or 7). - * @param[in] norm_type Normalization type. if 1, L1-Norm otherwise L2-Norm. - * @param[in] border_mode Border mode to use for the convolution. - * @param[in] constant_border_value (Optional) Constant value to use for borders if border_mode is set to CONSTANT. - */ - void configure(const CLCompileContext &compile_context, ICLTensor *input, ICLTensor *output, int32_t upper_thr, int32_t lower_thr, int32_t gradient_size, int32_t norm_type, BorderMode border_mode, - uint8_t constant_border_value = 0); - - // Inherited methods overridden: - virtual void run() override; - -private: - MemoryGroup _memory_group; /**< Function's memory group */ - std::unique_ptr _sobel; /**< Pointer to Sobel kernel. */ - std::unique_ptr _gradient; /**< Gradient kernel. */ - std::unique_ptr _border_mag_gradient; /**< Fill border on magnitude tensor kernel */ - std::unique_ptr _non_max_suppr; /**< Non-Maxima suppression kernel. */ - std::unique_ptr _edge_trace; /**< Edge tracing kernel. */ - CLImage _gx; /**< Source tensor - Gx component. */ - CLImage _gy; /**< Source tensor - Gy component. */ - CLImage _mag; /**< Source tensor - Magnitude. */ - CLImage _phase; /**< Source tensor - Phase. */ - CLImage _nonmax; /**< Source tensor - Non-Maxima suppressed. */ - CLImage _visited, _recorded, _l1_list_counter, _l1_stack; /**< Temporary tensors */ - ICLTensor *_output; /**< Output tensor provided by the user. */ -}; -} // namespace arm_compute - -#endif /* ARM_COMPUTE_CLCANNYEDGE_H */ -- cgit v1.2.1