From f47f718e87889b7d501a48e1d86b5d12b2e3f54c Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
Date: Fri, 15 Jan 2021 09:29:50 +0000
Subject: Make CLFloor and CLActivation kernels and functions state-less

Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Icbe4e6a7c6732a59bdda0136af44c4852452dfd1
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4891
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
---
 src/runtime/CL/functions/CLActivationLayer.cpp | 38 +++++++---------------
 src/runtime/CL/functions/CLFloor.cpp           | 44 ++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 33 deletions(-)

(limited to 'src/runtime/CL')

diff --git a/src/runtime/CL/functions/CLActivationLayer.cpp b/src/runtime/CL/functions/CLActivationLayer.cpp
index 0070e43f8c..9c71b2aa7d 100644
--- a/src/runtime/CL/functions/CLActivationLayer.cpp
+++ b/src/runtime/CL/functions/CLActivationLayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -25,32 +25,19 @@
 
 #include "arm_compute/core/CL/ICLTensor.h"
 #include "arm_compute/core/Types.h"
+#include "arm_compute/core/Validate.h"
 #include "arm_compute/runtime/CL/CLRuntimeContext.h"
-#include "src/core/CL/kernels/CLActivationLayerKernel.h"
+#include "src/core/CL/ICLKernel.h"
+#include "src/runtime/gpu/cl/operators/ClActivation.h"
 
 namespace arm_compute
 {
-namespace experimental
-{
-void CLActivation::configure(const CLCompileContext &compile_context, ITensorInfo *input, ITensorInfo *output, ActivationLayerInfo act_info)
-{
-    auto k = std::make_unique<CLActivationLayerKernel>();
-    k->configure(compile_context, input, output, act_info);
-    _kernel = std::move(k);
-}
-
-Status CLActivation::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info)
-{
-    return CLActivationLayerKernel::validate(input, output, act_info);
-}
-} // namespace experimental
-
 struct CLActivationLayer::Impl
 {
-    const ICLTensor                            *src{ nullptr };
-    ICLTensor                                  *dst{ nullptr };
-    CLRuntimeContext                           *ctx{ nullptr };
-    std::unique_ptr<experimental::CLActivation> op{ nullptr };
+    const ICLTensor                      *src{ nullptr };
+    ICLTensor                            *dst{ nullptr };
+    CLRuntimeContext                     *ctx{ nullptr };
+    std::unique_ptr<opencl::ClActivation> op{ nullptr };
 };
 
 CLActivationLayer::CLActivationLayer(CLRuntimeContext *ctx)
@@ -58,12 +45,9 @@ CLActivationLayer::CLActivationLayer(CLRuntimeContext *ctx)
 {
     _impl->ctx = ctx;
 }
-
 CLActivationLayer::CLActivationLayer(CLActivationLayer &&) = default;
-
 CLActivationLayer &CLActivationLayer::operator=(CLActivationLayer &&) = default;
-
-CLActivationLayer::~CLActivationLayer() = default;
+CLActivationLayer::~CLActivationLayer()                               = default;
 
 void CLActivationLayer::configure(ICLTensor *input, ICLTensor *output, ActivationLayerInfo act_info)
 {
@@ -77,13 +61,13 @@ void CLActivationLayer::configure(const CLCompileContext &compile_context, ICLTe
     _impl->src = input;
     _impl->dst = output == nullptr ? input : output;
 
-    _impl->op = std::make_unique<experimental::CLActivation>();
+    _impl->op = std::make_unique<opencl::ClActivation>();
     _impl->op->configure(compile_context, _impl->src->info(), _impl->dst->info(), act_info);
 }
 
 Status CLActivationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info)
 {
-    return experimental::CLActivation::validate(input, output, act_info);
+    return opencl::ClActivation::validate(input, output, act_info);
 }
 
 void CLActivationLayer::run()
diff --git a/src/runtime/CL/functions/CLFloor.cpp b/src/runtime/CL/functions/CLFloor.cpp
index 5549d09b24..4c5e482b10 100644
--- a/src/runtime/CL/functions/CLFloor.cpp
+++ b/src/runtime/CL/functions/CLFloor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020 Arm Limited.
+ * Copyright (c) 2016-2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,10 +23,30 @@
  */
 #include "arm_compute/runtime/CL/functions/CLFloor.h"
 
-#include "src/core/CL/kernels/CLFloorKernel.h"
+#include "arm_compute/core/CL/CLKernelLibrary.h"
+#include "arm_compute/core/CL/ICLTensor.h"
+#include "arm_compute/core/Types.h"
+#include "arm_compute/core/Validate.h"
+#include "src/core/CL/ICLKernel.h"
+#include "src/runtime/gpu/cl/operators/ClFloor.h"
 
 namespace arm_compute
 {
+struct CLFloor::Impl
+{
+    const ICLTensor                 *src{ nullptr };
+    ICLTensor                       *dst{ nullptr };
+    std::unique_ptr<opencl::ClFloor> op{ nullptr };
+};
+
+CLFloor::CLFloor()
+    : _impl(std::make_unique<Impl>())
+{
+}
+CLFloor::CLFloor(CLFloor &&) = default;
+CLFloor &CLFloor::operator=(CLFloor &&) = default;
+CLFloor::~CLFloor()                     = default;
+
 void CLFloor::configure(const ICLTensor *input, ICLTensor *output)
 {
     configure(CLKernelLibrary::get().get_compile_context(), input, output);
@@ -34,13 +54,25 @@ void CLFloor::configure(const ICLTensor *input, ICLTensor *output)
 
 void CLFloor::configure(const CLCompileContext &compile_context, const ICLTensor *input, ICLTensor *output)
 {
-    auto k = std::make_unique<CLFloorKernel>();
-    k->configure(compile_context, input, output);
-    _kernel = std::move(k);
+    ARM_COMPUTE_ERROR_ON_NULLPTR(input);
+
+    _impl->src = input;
+    _impl->dst = output;
+
+    _impl->op = std::make_unique<opencl::ClFloor>();
+    _impl->op->configure(compile_context, _impl->src->info(), _impl->dst->info());
 }
 
 Status CLFloor::validate(const ITensorInfo *input, const ITensorInfo *output)
 {
-    return CLFloorKernel::validate(input, output);
+    return opencl::ClFloor::validate(input, output);
+}
+
+void CLFloor::run()
+{
+    ITensorPack pack;
+    pack.add_tensor(TensorType::ACL_SRC, _impl->src);
+    pack.add_tensor(TensorType::ACL_DST, _impl->dst);
+    _impl->op->run(pack);
 }
 } // namespace arm_compute
-- 
cgit v1.2.1