From 33753901d4c77c958d006fb8e4a283a9a33c4426 Mon Sep 17 00:00:00 2001 From: John Mcloughlin Date: Wed, 7 Feb 2024 15:00:57 +0000 Subject: IVGCVSW-7624 GpuFsa Op: Add Softmax operator * Added softmax operator support * Added test cases Signed-off-by: John Mcloughlin Change-Id: I51d530b110c4cb812f5aab31ad1ee4022d81d19e --- src/backends/gpuFsa/layers/CMakeLists.txt | 2 + src/backends/gpuFsa/layers/GpuFsaSoftmax.cpp | 106 +++++++++++++++++++++++++++ src/backends/gpuFsa/layers/GpuFsaSoftmax.hpp | 24 ++++++ 3 files changed, 132 insertions(+) create mode 100644 src/backends/gpuFsa/layers/GpuFsaSoftmax.cpp create mode 100644 src/backends/gpuFsa/layers/GpuFsaSoftmax.hpp (limited to 'src/backends/gpuFsa/layers') diff --git a/src/backends/gpuFsa/layers/CMakeLists.txt b/src/backends/gpuFsa/layers/CMakeLists.txt index 37d52e4da1..c7b83ae438 100644 --- a/src/backends/gpuFsa/layers/CMakeLists.txt +++ b/src/backends/gpuFsa/layers/CMakeLists.txt @@ -18,6 +18,8 @@ list(APPEND armnnGpuFsaBackendLayers_sources GpuFsaPooling2d.hpp GpuFsaResize.cpp GpuFsaResize.hpp + GpuFsaSoftmax.cpp + GpuFsaSoftmax.hpp UtilsGpuFsa.cpp UtilsGpuFsa.hpp ) diff --git a/src/backends/gpuFsa/layers/GpuFsaSoftmax.cpp b/src/backends/gpuFsa/layers/GpuFsaSoftmax.cpp new file mode 100644 index 0000000000..6e5aa26bef --- /dev/null +++ b/src/backends/gpuFsa/layers/GpuFsaSoftmax.cpp @@ -0,0 +1,106 @@ +// +// Copyright © 2024 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "GpuFsaSoftmax.hpp" + +#include +#include + +#include +#include +#include +#include + +using namespace arm_compute::experimental::dynamic_fusion; +using namespace armnn::armcomputetensorutils; + +namespace armnn +{ + +arm_compute::Status GpuFsaSoftmaxValidate(const TensorInfo& input, + const TensorInfo& output, + const SoftmaxDescriptor& descriptor) +{ + // Create a new workload sketch, for validation purposes + auto compileCtx = arm_compute::CLKernelLibrary::get().get_compile_context(); + auto workloadContext = GpuWorkloadContext(&compileCtx); + GpuWorkloadSketch sketch{ &workloadContext }; + + // Build and create tensor infos using the sketch + arm_compute::TensorInfo aclInputInfo = BuildArmComputeTensorInfo(input, input.GetNumDimensions()); + arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output, output.GetNumDimensions()); + aclInputInfo.set_are_values_constant(input.IsConstant()); + aclOutputInfo.set_are_values_constant(output.IsConstant()); + arm_compute::ITensorInfo* inputInfo = workloadContext.create_tensor_info(aclInputInfo); + arm_compute::ITensorInfo* outputInfo = workloadContext.create_tensor_info(aclOutputInfo); + + // Set Softmax attributes using descriptor + SoftmaxAttributes softmaxAttributes{}; + softmaxAttributes.beta(descriptor.m_Beta); + softmaxAttributes.is_log_softmax(false); // Use Softmax not LogSoftmax + int aclAxis = ComputeAclAxis(descriptor.m_Axis, input); + softmaxAttributes.axis(aclAxis); + + // Validate operator, check status and update reasonIfUnsupported + arm_compute::Status aclStatus = GpuSoftmax::validate_op(sketch, + inputInfo, + outputInfo, + softmaxAttributes); + +#ifndef NDEBUG + const bool validated = aclStatus.error_code() == arm_compute::ErrorCode::OK; + if (!validated) + { + std::cout << "GpuFsaSoftmaxValidate failed: " << aclStatus.error_description() << std::endl; + } +#endif + + return aclStatus; +} + +void GpuFsaSoftmaxCreateOp(GpuFsaPreCompiledBlob* blob, + const TensorInfo& input, + const TensorInfo& output, + const SoftmaxDescriptor& descriptor) +{ + GpuWorkloadSketch* sketch = blob->sketch.get(); + GpuWorkloadContext* workloadContext = blob->workloadContext.get(); + std::vector inputTensorInfos = {}; + std::vector outputTensorInfos = {}; + + arm_compute::TensorInfo aclInputInfo = BuildArmComputeTensorInfo(input, input.GetNumDimensions()); + arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output, output.GetNumDimensions()); + aclInputInfo.set_are_values_constant(input.IsConstant()); + aclOutputInfo.set_are_values_constant(output.IsConstant()); + + inputTensorInfos.emplace_back(workloadContext->create_tensor_info(aclInputInfo)); + outputTensorInfos.emplace_back(workloadContext->create_tensor_info(aclOutputInfo)); + + // Set Softmax attributes using descriptor + SoftmaxAttributes softmaxAttributes{}; + softmaxAttributes.beta(descriptor.m_Beta); // Only used for LogSoftmax else default + softmaxAttributes.is_log_softmax(false); // Use Softmax not LogSoftmax + int aclAxis = ComputeAclAxis(descriptor.m_Axis, input); + softmaxAttributes.axis(aclAxis); + + // Validate operator, check status and update reasonIfUnsupported + arm_compute::Status aclStatus = GpuSoftmax::validate_op(*sketch, + inputTensorInfos[0], + outputTensorInfos[0], + softmaxAttributes); + const bool supported = aclStatus.error_code() == arm_compute::ErrorCode::OK; + if (!supported) + { + throw BackendCapabilityException("\"GpuFsa\" backend failed during softmax validation"); + } + + GpuSoftmax::create_op(*sketch, inputTensorInfos[0], outputTensorInfos[0], softmaxAttributes); + + // Store the TensorInfos within the blob as unique_ptrs to be used later + blob->inputTensorInfos = std::make_unique>(inputTensorInfos); + blob->outputTensorInfos = std::make_unique>(outputTensorInfos); +} + +} \ No newline at end of file diff --git a/src/backends/gpuFsa/layers/GpuFsaSoftmax.hpp b/src/backends/gpuFsa/layers/GpuFsaSoftmax.hpp new file mode 100644 index 0000000000..cf078fc33f --- /dev/null +++ b/src/backends/gpuFsa/layers/GpuFsaSoftmax.hpp @@ -0,0 +1,24 @@ +// +// Copyright © 2024 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +#include + +namespace armnn +{ + +arm_compute::Status GpuFsaSoftmaxValidate(const TensorInfo& input, + const TensorInfo& output, + const SoftmaxDescriptor& descriptor); + +void GpuFsaSoftmaxCreateOp(GpuFsaPreCompiledBlob* blob, + const TensorInfo& input, + const TensorInfo& output, + const SoftmaxDescriptor& descriptor); + +} \ No newline at end of file -- cgit v1.2.1