Remove 21.08 deprecated code

Also correct some deprecation macros

Signed-off-by: Freddie Liardet <frederick.liardet@arm.com>
Change-Id: Ib28d42571f55d7b01563a0877b92b8f3128831ba
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6036
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

4 files changed, 3 insertions, 68 deletions

diff --git a/arm_compute/runtime/CL/CLTuner.h b/arm_compute/runtime/CL/CLTuner.h
index f1bae3f8dc..f96edc962b 100644
--- a/arm_compute/runtime/CL/CLTuner.h
+++ b/arm_compute/runtime/CL/CLTuner.h
@@ -75,24 +75,6 @@ public:
      */
     void set_tuner_mode(CLTunerMode mode);
 
-    /** Get the current OpenCL tuner mode
-     *
-     * @return tuner_mode Indicates how exhaustive the search for the optimal tuning parameters should be while tuning
-     *
-     * @deprecated This function is deprecated and is intended to be removed in 21.08 release
-     */
-    CLTunerMode get_tuner_mode() const;
-
-    /** Manually add a LWS for a kernel
-     *
-     * @param[in] kernel_id   Unique identifiant of the kernel
-     * @param[in] optimal_lws Optimal local workgroup size to use for the given kernel
-     *
-     * @deprecated This function is deprecated and is intended to be removed in 21.08 release
-     */
-    ARM_COMPUTE_DEPRECATED_REL_REPLACE(21.02, add_tuning_params)
-    void add_lws_to_table(const std::string &kernel_id, cl::NDRange optimal_lws);
-
     /** Manually add tuning parameters for a kernel
      *
      * @param[in] kernel_id             Unique identifiant of the kernel
@@ -100,30 +82,12 @@ public:
      */
     void add_tuning_params(const std::string &kernel_id, CLTuningParams optimal_tuning_params);
 
-    /** Import LWS table
-     *
-     * @param[in] lws_table The unordered_map container to import
-     *
-     * @deprecated This function is deprecated and is intended to be removed in 21.08 release
-     */
-    ARM_COMPUTE_DEPRECATED_REL_REPLACE(21.02, import_tuning_params)
-    void import_lws_table(const std::unordered_map<std::string, cl::NDRange> &lws_table);
-
     /** Import tuning parameters table
      *
      * @param[in] tuning_params_table The unordered_map container to import
      */
     void import_tuning_params(const std::unordered_map<std::string, CLTuningParams> &tuning_params_table);
 
-    /** Give read access to the LWS table
-     *
-     * @return The lws table as unordered_map container
-     *
-     * @deprecated This function is deprecated and is intended to be removed in 21.08 release
-     */
-    ARM_COMPUTE_DEPRECATED_REL_REPLACE(21.02, tuning_params_table)
-    const std::unordered_map<std::string, cl::NDRange> &lws_table();
-
     /** Give read access to the tuning params table
      *
      * @return The tuning params table as unordered_map container
diff --git a/arm_compute/runtime/CL/functions/CLRemap.h b/arm_compute/runtime/CL/functions/CLRemap.h
index 8322f7a8a9..ae75817d0e 100644
--- a/arm_compute/runtime/CL/functions/CLRemap.h
+++ b/arm_compute/runtime/CL/functions/CLRemap.h
@@ -68,7 +68,7 @@ public:
      * @deprecated This function is deprecated and is intended to be removed in 22.02 release
      *
      */
-    ARM_COMPUTE_DEPRECATED_REL(22.02)
+    ARM_COMPUTE_DEPRECATED_REL(21.08)
     void configure(const CLCompileContext &compile_context, ICLTensor *input, const ICLTensor *map_x, const ICLTensor *map_y, ICLTensor *output,
                    InterpolationPolicy policy, BorderMode border_mode, uint8_t constant_border_value = 0);
 
@@ -80,7 +80,7 @@ public:
      * @deprecated This function is deprecated and is intended to be removed in 22.02 release
      *
      */
-    ARM_COMPUTE_DEPRECATED_REL(22.02)
+    ARM_COMPUTE_DEPRECATED_REL(21.08)
     void configure(ICLTensor *input, const ICLTensor *map_x, const ICLTensor *map_y, ICLTensor *output,
                    InterpolationPolicy policy, BorderMode border_mode, uint8_t constant_border_value = 0);
 
diff --git a/arm_compute/runtime/NEON/functions/NERemap.h b/arm_compute/runtime/NEON/functions/NERemap.h
index 140c20bd2f..5d50517b01 100644
--- a/arm_compute/runtime/NEON/functions/NERemap.h
+++ b/arm_compute/runtime/NEON/functions/NERemap.h
@@ -62,7 +62,7 @@ public:
      * @deprecated This function is deprecated and is intended to be removed in 22.02 release
      *
      */
-    ARM_COMPUTE_DEPRECATED_REL(22.02)
+    ARM_COMPUTE_DEPRECATED_REL(21.08)
     void configure(ITensor *input, const ITensor *map_x, const ITensor *map_y, ITensor *output,
                    InterpolationPolicy policy, BorderMode border_mode, uint8_t constant_border_value = 0);
     /** Initialise the function's sources, destination, interpolation policy and border mode.
diff --git a/src/runtime/CL/CLTuner.cpp b/src/runtime/CL/CLTuner.cpp
index e16d6808ed..5dec81be2c 100644
--- a/src/runtime/CL/CLTuner.cpp
+++ b/src/runtime/CL/CLTuner.cpp
@@ -63,11 +63,6 @@ void CLTuner::set_tuner_mode(CLTunerMode mode)
     _tuning_info.tuner_mode = mode;
 }
 
-CLTunerMode CLTuner::get_tuner_mode() const
-{
-    return _tuning_info.tuner_mode;
-}
-
 void CLTuner::tune_kernel_static(ICLKernel &kernel)
 {
     ARM_COMPUTE_UNUSED(kernel);
@@ -119,11 +114,6 @@ void CLTuner::tune_kernel_dynamic(ICLKernel &kernel, ITensorPack &tensors)
     }
 }
 
-void CLTuner::add_lws_to_table(const std::string &kernel_id, cl::NDRange optimal_lws)
-{
-    add_tuning_params(kernel_id, CLTuningParams(optimal_lws));
-}
-
 void CLTuner::add_tuning_params(const std::string &kernel_id, CLTuningParams optimal_tuning_params)
 {
     _tuning_params_table.emplace(kernel_id, optimal_tuning_params);
@@ -247,25 +237,6 @@ CLTuningParams CLTuner::find_optimal_tuning_params(ICLKernel &kernel, ITensorPac
     return opt_tuning_params;
 }
 
-void CLTuner::import_lws_table(const std::unordered_map<std::string, cl::NDRange> &lws_table)
-{
-    _tuning_params_table.clear();
-    for(auto && params : lws_table)
-    {
-        add_tuning_params(params.first, CLTuningParams(params.second));
-    }
-}
-
-const std::unordered_map<std::string, cl::NDRange> &CLTuner::lws_table()
-{
-    _lws_table.clear();
-    for(auto && params : _tuning_params_table)
-    {
-        _lws_table.emplace(params.first, params.second.get_lws());
-    }
-    return _lws_table;
-}
-
 const std::unordered_map<std::string, CLTuningParams> &CLTuner::tuning_params_table() const
 {
     return _tuning_params_table;