commit 8398edcfb933b638ddf4b88d84d6e188c49b1e0d
author Teresa Charlin <teresa.charlinreyes@arm.com> Mon Jul 20 14:23:02 2020 +0100
committer Jim Flynn <jim.flynn@arm.com> Fri Jul 24 22:51:19 2020 +0000
tree 2dbb158b19c135007baf6178d84acf9e770938d9
parent 2ebe095eec687f03c2f23051b31cfa4309d3e67b

IVGCVSW-3896 Add CL LOG_SOFTMAX Workload

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I6c5704c6c7bcf1dd008061c037c81a712365aa74

src/backends/cl/workloads/CMakeLists.txt

diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt
index fe9c9fa..24c09ad 100644
--- a/src/backends/cl/workloads/CMakeLists.txt
+++ b/src/backends/cl/workloads/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright © 2017 Arm Ltd. All rights reserved.
+# Copyright © 2017 Arm Ltd anc Contributors. All rights reserved.
 # SPDX-License-Identifier: MIT
 #
 
@@ -50,6 +50,8 @@
     ClInstanceNormalizationWorkload.hpp
     ClL2NormalizationFloatWorkload.cpp
     ClL2NormalizationFloatWorkload.hpp
+    ClLogSoftmaxWorkload.cpp
+    ClLogSoftmaxWorkload.hpp
     ClLstmFloatWorkload.cpp
     ClLstmFloatWorkload.hpp
     ClMaximumWorkload.cpp

src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp

diff --git a/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp b/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp
new file mode 100644
index 0000000..bd14d51
--- /dev/null
+++ b/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp
@@ -0,0 +1,48 @@
+//
+// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#include "ClLogSoftmaxWorkload.hpp"
+#include "ClWorkloadUtils.hpp"
+
+#include <aclCommon/ArmComputeTensorUtils.hpp>
+#include <aclCommon/ArmComputeUtils.hpp>
+
+#include <cl/ClTensorHandle.hpp>
+
+namespace armnn
+{
+
+arm_compute::Status ClLogSoftmaxWorkloadValidate(const TensorInfo& input,
+                                                 const TensorInfo& output,
+                                                 const LogSoftmaxDescriptor& descriptor)
+{
+    const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input);
+    const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output);
+
+    unsigned int aclAxis = ComputeSoftmaxAclAxis<unsigned int>(descriptor, input);
+    return arm_compute::CLLogSoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta, aclAxis);
+}
+
+ClLogSoftmaxWorkload::ClLogSoftmaxWorkload(const LogSoftmaxQueueDescriptor& descriptor, const WorkloadInfo& info,
+                                           std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager)
+        : BaseWorkload<LogSoftmaxQueueDescriptor>(descriptor, info)
+        , m_LogSoftmaxLayer(memoryManager)
+{
+    m_Data.ValidateInputsOutputs("ClLogSoftmaxWorkload", 1, 1);
+
+    arm_compute::ICLTensor& input  = static_cast<ClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor();
+    arm_compute::ICLTensor& output = static_cast<ClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor();
+
+    unsigned int aclAxis = ComputeSoftmaxAclAxis<unsigned int>(m_Data.m_Parameters, info.m_InputTensorInfos[0]);
+    m_LogSoftmaxLayer.configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis);
+}
+
+void ClLogSoftmaxWorkload::Execute() const
+{
+    ARMNN_SCOPED_PROFILING_EVENT_CL("ClLogSoftmaxWorkload_Execute");
+    RunClFunction(m_LogSoftmaxLayer, CHECK_LOCATION());
+}
+
+} // namespace armnn

src/backends/cl/workloads/ClLogSoftmaxWorkload.hpp

diff --git a/src/backends/cl/workloads/ClLogSoftmaxWorkload.hpp b/src/backends/cl/workloads/ClLogSoftmaxWorkload.hpp
new file mode 100644
index 0000000..9b531ad
--- /dev/null
+++ b/src/backends/cl/workloads/ClLogSoftmaxWorkload.hpp
@@ -0,0 +1,35 @@
+//
+// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <armnn/Descriptors.hpp>
+
+#include <arm_compute/core/Error.h>
+#include <arm_compute/runtime/MemoryManagerOnDemand.h>
+#include <arm_compute/runtime/CL/functions/CLSoftmaxLayer.h>
+
+
+#include <backendsCommon/Workload.hpp>
+
+namespace armnn
+{
+
+arm_compute::Status ClLogSoftmaxWorkloadValidate(const TensorInfo& input,
+                                                 const TensorInfo& output,
+                                                 const LogSoftmaxDescriptor& descriptor);
+
+class ClLogSoftmaxWorkload : public BaseWorkload<LogSoftmaxQueueDescriptor>
+{
+public:
+    ClLogSoftmaxWorkload(const LogSoftmaxQueueDescriptor& descriptor, const WorkloadInfo& info,
+                         std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager);
+    void Execute() const override;
+
+private:
+    mutable arm_compute::CLLogSoftmaxLayer m_LogSoftmaxLayer;
+};
+
+} // namespace armnn

src/backends/cl/workloads/ClWorkloads.hpp

diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp
index 99f3e62..b48e5a6 100644
--- a/src/backends/cl/workloads/ClWorkloads.hpp
+++ b/src/backends/cl/workloads/ClWorkloads.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -24,6 +24,7 @@
 #include "ClGatherWorkload.hpp"
 #include "ClInstanceNormalizationWorkload.hpp"
 #include "ClL2NormalizationFloatWorkload.hpp"
+#include "ClLogSoftmaxWorkload.hpp"
 #include "ClLstmFloatWorkload.hpp"
 #include "ClConcatWorkload.hpp"
 #include "ClMaximumWorkload.hpp"