Update deprecation notices
Change-Id: I6db0a10249b2212add3ff4bb2598b03cae2bff55
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5098
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
diff --git a/arm_compute/core/CL/CLKernelLibrary.h b/arm_compute/core/CL/CLKernelLibrary.h
index 0d8e4a6..24eef63 100644
--- a/arm_compute/core/CL/CLKernelLibrary.h
+++ b/arm_compute/core/CL/CLKernelLibrary.h
@@ -47,7 +47,7 @@
public:
/** Access the KernelLibrary singleton.
- * This method has been deprecated and will be removed in the next release.
+ * This method has been deprecated and will be removed in future releases
* @return The KernelLibrary instance.
*/
static CLKernelLibrary &get();
diff --git a/arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h b/arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h
index fc39bef..8ecdd19 100644
--- a/arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h
+++ b/arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019 Arm Limited.
+ * Copyright (c) 2017-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -198,7 +198,7 @@
/** Prevent instances of this class from being copied */
const GCKernelLibrary &operator=(const GCKernelLibrary &) = delete;
/** Get the static instance of @ref GCKernelLibrary.
- * This method has been deprecated and will be removed in the next release.
+ * This method has been deprecated and will be removed in future releases.
* @return The static instance of GCKernelLibrary.
*/
static GCKernelLibrary &get();
diff --git a/arm_compute/core/utils/misc/ShapeCalculator.h b/arm_compute/core/utils/misc/ShapeCalculator.h
index 5ed8aea..56038dd 100644
--- a/arm_compute/core/utils/misc/ShapeCalculator.h
+++ b/arm_compute/core/utils/misc/ShapeCalculator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2020 Arm Limited.
+ * Copyright (c) 2017-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -916,8 +916,6 @@
/** Calculate the matrix multiplication output shape of two tensors
*
- * @note Deprecated. Remove when GEMMReshapeInfo is not used anymore by any other kernels
- *
* @param[in] input0 First input tensor info
* @param[in] input1 Second input tensor info
* @param[in] gemm_info GEMM reshape info
diff --git a/arm_compute/runtime/CL/CLTensor.h b/arm_compute/runtime/CL/CLTensor.h
index 61a7dfa..ae73351 100644
--- a/arm_compute/runtime/CL/CLTensor.h
+++ b/arm_compute/runtime/CL/CLTensor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -46,7 +46,7 @@
* @param[in] ctx (Optional) Pointer to a @ref CLRuntimeContext.
* If nullptr is passed in, the legacy api using the singletons will be used. Otherwise the memory for the
* tensor will allocate on the context passed in.
- * The singletons legacy api has been deprecated and will be removed.
+ * The singletons legacy api has been deprecated and will be removed in future releases.
*/
CLTensor(IRuntimeContext *ctx = nullptr);
diff --git a/arm_compute/runtime/CL/functions/CLThreshold.h b/arm_compute/runtime/CL/functions/CLThreshold.h
index c536232..a681748 100644
--- a/arm_compute/runtime/CL/functions/CLThreshold.h
+++ b/arm_compute/runtime/CL/functions/CLThreshold.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -46,20 +46,6 @@
public:
/** Initialise the function's source, destination, thresholds and threshold type
*
- * @param[in] input First tensor input. Data types supported: U8.
- * @param[out] output Output tensor. Data types supported: U8.
- * @param[in] threshold Threshold. If upper threshold is specified, this will be used as the lower threshold.
- * @param[in] false_value Value to assign when the condition is false.
- * @param[in] true_value value to assign when the condition is true.
- * @param[in] type Thresholding type. Can either be BINARY or RANGE.
- * @param[in] upper Upper threshold. Only used with RANGE thresholding
- */
- ARM_COMPUTE_DEPRECATED_REL(20.08)
- void configure(const ICLTensor *input, ICLTensor *output, uint8_t threshold,
- uint8_t false_value = 0, uint8_t true_value = 0,
- ThresholdType type = ThresholdType::BINARY, uint8_t upper = 0);
- /** Initialise the function's source, destination, thresholds and threshold type
- *
* @param[in] input First tensor input. Data types supported: U8.
* @param[out] output Output tensor. Data types supported: U8.
* @param[in] info Threshold descriptor
diff --git a/arm_compute/runtime/CPP/CPPScheduler.h b/arm_compute/runtime/CPP/CPPScheduler.h
index 9e8fd41..f4f6a13 100644
--- a/arm_compute/runtime/CPP/CPPScheduler.h
+++ b/arm_compute/runtime/CPP/CPPScheduler.h
@@ -42,7 +42,7 @@
/** Access the scheduler singleton
*
- * @note this method has been deprecated and will be remover in the upcoming releases
+ * @note this method has been deprecated and will be remover in future releases
* @return The scheduler
*/
static CPPScheduler &get();
diff --git a/arm_compute/runtime/GLES_COMPUTE/functions/GCScale.h b/arm_compute/runtime/GLES_COMPUTE/functions/GCScale.h
index 17cfa56..8e44d3b 100644
--- a/arm_compute/runtime/GLES_COMPUTE/functions/GCScale.h
+++ b/arm_compute/runtime/GLES_COMPUTE/functions/GCScale.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -43,21 +43,6 @@
public:
/** Initialize the function's source, destination, interpolation type and border_mode.
*
- * @param[in,out] input Source tensor. Data types supported: F16. (Written to only for @p border_mode != UNDEFINED)
- * @param[out] output Destination tensor. Data types supported: Same as @p input
- * All but the lowest two dimensions must be the same size as in the input tensor, i.e. scaling is only performed within the XY-plane.
- * @param[in] policy The interpolation type.
- * @param[in] border_mode Strategy to use for borders.
- * @param[in] constant_border_value (Optional) Constant value to use for borders if border_mode is set to CONSTANT.
- * @param[in] sampling_policy (Optional) Sampling policy used by the interpolation. Defaults to @ref SamplingPolicy::CENTER
- * @param[in] use_padding (Optional) Is padding in use or not. Defaults to true.
- * @param[in] align_corners (Optional) Align corners of input and output, only affecting bilinear policy with TOP_LEFT sampling policy. Defaults to false.
- */
- ARM_COMPUTE_DEPRECATED_REL(20.08)
- void configure(IGCTensor *input, IGCTensor *output, InterpolationPolicy policy, BorderMode border_mode, PixelValue constant_border_value = PixelValue(),
- SamplingPolicy sampling_policy = SamplingPolicy::CENTER, bool use_padding = true, bool align_corners = false);
- /** Initialize the function's source, destination, interpolation type and border_mode.
- *
* @param[in,out] input Source tensor. Data types supported: F16. (Written to only for @p border_mode != UNDEFINED)
* @param[out] output Destination tensor. Data types supported: Same as @p input
* All but the lowest two dimensions must be the same size as in the input tensor, i.e. scaling is only performed within the XY-plane.
diff --git a/arm_compute/runtime/NEON/functions/NEThreshold.h b/arm_compute/runtime/NEON/functions/NEThreshold.h
index 9860abf..443571f 100644
--- a/arm_compute/runtime/NEON/functions/NEThreshold.h
+++ b/arm_compute/runtime/NEON/functions/NEThreshold.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -46,19 +46,6 @@
public:
/** Initialise the function's source, destination, thresholds and threshold type
*
- * @param[in] input First tensor input. Data type supported: U8.
- * @param[out] output Output tensor. Data type supported: U8.
- * @param[in] threshold Threshold. If upper threshold is specified, this will be used as the lower threshold
- * @param[in] false_value Value to assign when the condition is false
- * @param[in] true_value value to assign when the condition is true
- * @param[in] type Thresholding type. Can either be BINARY or RANGE.
- * @param[in] upper Upper threshold. Only used with RANGE thresholding
- */
- ARM_COMPUTE_DEPRECATED_REL(20.08)
- void configure(const ITensor *input, ITensor *output, uint8_t threshold, uint8_t false_value = 0, uint8_t true_value = 0,
- ThresholdType type = ThresholdType::BINARY, uint8_t upper = 0);
- /** Initialise the function's source, destination, thresholds and threshold type
- *
* @param[in] input First tensor input. Data type supported: U8.
* @param[out] output Output tensor. Data type supported: U8.
* @param[in] info Threshold descriptor
diff --git a/arm_compute/runtime/NEON/functions/NEWarpAffine.h b/arm_compute/runtime/NEON/functions/NEWarpAffine.h
index 0aedb87..c83a3ce 100644
--- a/arm_compute/runtime/NEON/functions/NEWarpAffine.h
+++ b/arm_compute/runtime/NEON/functions/NEWarpAffine.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -35,7 +35,7 @@
/** Basic function to run @ref NEWarpAffineKernel
*
- * @deprecated This function is deprecated and will be removed in release 20.02
+ * @deprecated This function is deprecated and will be removed in release 21.05
*
*/
class NEWarpAffine : public INESimpleFunction
diff --git a/docs/00_introduction.dox b/docs/00_introduction.dox
index 91ef5bf..97a24bb 100644
--- a/docs/00_introduction.dox
+++ b/docs/00_introduction.dox
@@ -110,6 +110,10 @@
- @ref CLBitwiseKernel
- ClFloorKernel
- @ref CLTransposeKernel
+ - Deprecate functions in CLTuner:
+ - add_lws_to_table
+ - import_lws_table
+ - lws_table
- Remove functions:
- NELocallyConnectedLayer / CLLocallyConnectedLayer
- NEIm2Col
diff --git a/src/runtime/CL/functions/CLThreshold.cpp b/src/runtime/CL/functions/CLThreshold.cpp
index 901cfd8..70bc3b9 100644
--- a/src/runtime/CL/functions/CLThreshold.cpp
+++ b/src/runtime/CL/functions/CLThreshold.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -29,11 +29,6 @@
namespace arm_compute
{
-void CLThreshold::configure(const ICLTensor *input, ICLTensor *output, uint8_t threshold, uint8_t false_value, uint8_t true_value, ThresholdType type, uint8_t upper)
-{
- configure(CLKernelLibrary::get().get_compile_context(), input, output, ThresholdKernelInfo(threshold, false_value, true_value, type, upper));
-}
-
void CLThreshold::configure(const ICLTensor *input, ICLTensor *output, const ThresholdKernelInfo &info)
{
configure(CLKernelLibrary::get().get_compile_context(), input, output, info);
diff --git a/src/runtime/CPP/CPPScheduler.cpp b/src/runtime/CPP/CPPScheduler.cpp
index 73e26ac..a26b580 100644
--- a/src/runtime/CPP/CPPScheduler.cpp
+++ b/src/runtime/CPP/CPPScheduler.cpp
@@ -273,7 +273,7 @@
};
/*
- * This singleton has been deprecated and will be removed in the next release
+ * This singleton has been deprecated and will be removed in future releases
*/
CPPScheduler &CPPScheduler::get()
{
diff --git a/src/runtime/GLES_COMPUTE/functions/GCScale.cpp b/src/runtime/GLES_COMPUTE/functions/GCScale.cpp
index 720006f..225bb41 100644
--- a/src/runtime/GLES_COMPUTE/functions/GCScale.cpp
+++ b/src/runtime/GLES_COMPUTE/functions/GCScale.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -30,12 +30,6 @@
namespace arm_compute
{
-void GCScale::configure(IGCTensor *input, IGCTensor *output, InterpolationPolicy policy, BorderMode border_mode, PixelValue constant_border_value, SamplingPolicy sampling_policy, bool use_padding,
- bool align_corners)
-{
- configure(input, output, ScaleKernelInfo{ policy, border_mode, constant_border_value, sampling_policy, use_padding, align_corners });
-}
-
void GCScale::configure(IGCTensor *input, IGCTensor *output, const ScaleKernelInfo &info)
{
auto k = std::make_unique<GCScaleKernel>();
diff --git a/src/runtime/NEON/functions/NEThreshold.cpp b/src/runtime/NEON/functions/NEThreshold.cpp
index 4d382d6..2aa6ea8 100644
--- a/src/runtime/NEON/functions/NEThreshold.cpp
+++ b/src/runtime/NEON/functions/NEThreshold.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -29,11 +29,6 @@
namespace arm_compute
{
-void NEThreshold::configure(const ITensor *input, ITensor *output, uint8_t threshold, uint8_t false_value, uint8_t true_value, ThresholdType type, uint8_t upper)
-{
- configure(input, output, ThresholdKernelInfo(threshold, false_value, true_value, type, upper));
-}
-
void NEThreshold::configure(const ITensor *input, ITensor *output, const ThresholdKernelInfo &info)
{
auto k = std::make_unique<NEThresholdKernel>();
diff --git a/tests/main.cpp b/tests/main.cpp
index ff641c0..2c5eb9a 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -185,7 +185,7 @@
auto gles_ctx = std::make_unique<GCRuntimeContext>();
ARM_COMPUTE_ERROR_ON(gles_ctx == nullptr);
{
- // Legacy singletons API: This has been deprecated and the singletons will be removed
+ // Legacy singletons API: This has been deprecated and the singletons will be removed in future releases
// Setup singleton for backward compatibility
GCScheduler::get().default_init();
}