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 0d8e4a6164d54443aea95c30a8b70043b9eeb551..24eef639ae05e1189bafcaf776bcf0c295e6676b 100644 (file)
--- a/arm_compute/core/CL/CLKernelLibrary.h
+++ b/arm_compute/core/CL/CLKernelLibrary.h
@@ -47,7 +47,7 @@ private:
 
 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 fc39bef408a00ce15e9a72ee5f2d04467a1bbcbe..8ecdd194bfa2f1c842b6ff1d375dd55acfecc841 100644 (file)
--- 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 @@ public:
     /** 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 5ed8aea277d765e7a1083c3ab6282bb39e68a98b..56038dd8539a04b7749822afbb439d8c11b1a877 100644 (file)
--- 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
  *
@@ -915,8 +915,6 @@ inline TensorShape compute_mm_shape(const ITensorInfo &input0, const ITensorInfo
 }
 
 /** 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

diff --git a/arm_compute/runtime/CL/CLTensor.h b/arm_compute/runtime/CL/CLTensor.h
index 61a7dfaa94389b29e7d9af2e95f2e061f6a9ed8f..ae73351f275f77ea5b145b86307ab721622d0c72 100644 (file)
--- 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 @@ public:
      * @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 c536232e7178bcc2927fef01ba43c696cb5ac373..a6817483bba93dbf8605e4b4abc66f4ad6cc75d0 100644 (file)
--- 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
  *
@@ -44,20 +44,6 @@ class ICLTensor;
 class CLThreshold : public ICLSimpleFunction
 {
 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.

diff --git a/arm_compute/runtime/CPP/CPPScheduler.h b/arm_compute/runtime/CPP/CPPScheduler.h
index 9e8fd4174ad00294735e2b21f05248b47ababc62..f4f6a1311e3b42d26f3a789431e26a594a65baed 100644 (file)
--- a/arm_compute/runtime/CPP/CPPScheduler.h
+++ b/arm_compute/runtime/CPP/CPPScheduler.h
@@ -42,7 +42,7 @@ public:
 
     /** 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 17cfa565a978bf57a447ba79ca8d539d4a6bfa65..8e44d3bc70bb61aacd8a53ff7601bcb1b1776cae 100644 (file)
--- 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
  *
@@ -41,21 +41,6 @@ class IGCTensor;
 class GCScale : public IGCSimpleFunction
 {
 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)

diff --git a/arm_compute/runtime/NEON/functions/NEThreshold.h b/arm_compute/runtime/NEON/functions/NEThreshold.h
index 9860abf8350f5c27eae38176c825268964f22b83..443571f5a0a41670b927a1045701b514b4386f93 100644 (file)
--- 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
  *
@@ -44,19 +44,6 @@ class ITensorInfo;
 class NEThreshold : public INESimpleFunctionNoBorder
 {
 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.

diff --git a/arm_compute/runtime/NEON/functions/NEWarpAffine.h b/arm_compute/runtime/NEON/functions/NEWarpAffine.h
index 0aedb87aa27ee8d077e921b5717cd6899b9c7dc6..c83a3cefcf3b5b9a4d116f2742b30314ffa67a22 100644 (file)
--- 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 @@ class ITensor;
 
 /** 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 91ef5bf6a254ad6de81bf92e7b97fa44112d64d1..97a24bbdf6834695167dc4bbbb9cfaf3475ac48a 100644 (file)
--- a/docs/00_introduction.dox
+++ b/docs/00_introduction.dox
@@ -110,6 +110,10 @@ v21.02 Public major release
    - @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 901cfd8993722023ea1fced329db50ae2f1a5ff0..70bc3b93657acd42360e63cf1837390fe598eb19 100644 (file)
--- 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 73e26ac18759d6f37dc9907870ac70fd06c75865..a26b580b97ce4221b2d135518f62b3fc605c21a8 100644 (file)
--- a/src/runtime/CPP/CPPScheduler.cpp
+++ b/src/runtime/CPP/CPPScheduler.cpp
@@ -273,7 +273,7 @@ struct CPPScheduler::Impl final
 };
 
 /*
- * 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 720006feada2f52a0b93ddcbd21922fea4d4cb13..225bb4131f87c5c88dbb4e5502f9bade77c40407 100644 (file)
--- 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 4d382d6fabd272bc0bd3d3b54230a8ed7ea7f5a5..2aa6ea897af2df51bbae8a93758c68bbf90edb13 100644 (file)
--- 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 ff641c0762ba8d54ca3b4f39e0f2ab002c66f5b8..2c5eb9a2fdfa7a31026df5bd9861939d362cab89 100644 (file)
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -185,7 +185,7 @@ int main(int argc, char **argv)
             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();
             }