From be88a57579a9a848efe13e6c524b5b104b871733 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Thu, 30 Apr 2020 11:39:37 +0100 Subject: IVGCVSW-4753 Fix CpuAcc Hal 1.3 Softmax Failures * Refactor Neon Softmax workload to accept supported data types Signed-off-by: Sadik Armagan Change-Id: I54aa72d5cbb862cafcc1eabe48f6a00d61050cd7 --- .../neon/workloads/NeonSoftmaxUint8Workload.cpp | 51 ---------------------- 1 file changed, 51 deletions(-) delete mode 100644 src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp (limited to 'src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp') diff --git a/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp b/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp deleted file mode 100644 index 05d93b963c..0000000000 --- a/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "NeonSoftmaxUint8Workload.hpp" -#include "NeonWorkloadUtils.hpp" - -#include -#include - -#include - -namespace armnn -{ - -NeonSoftmaxUint8Workload::NeonSoftmaxUint8Workload(const SoftmaxQueueDescriptor& descriptor, - const WorkloadInfo& info, - std::shared_ptr& memoryManager) - : Uint8Workload(descriptor, info) -{ - m_Data.ValidateInputsOutputs("NeonSoftmaxUint8Workload", 1, 1); - - arm_compute::ITensor& input = PolymorphicDowncast(m_Data.m_Inputs[0])->GetTensor(); - arm_compute::ITensor& output = PolymorphicDowncast(m_Data.m_Outputs[0])->GetTensor(); - - const auto outputQuantization = output.info()->quantization_info(); - - if ((!outputQuantization.scale().empty() && outputQuantization.scale()[0] != (1.0f / 256.0f)) || - (!outputQuantization.offset().empty() && outputQuantization.offset()[0] != 0) || - outputQuantization.scale().empty() || outputQuantization.offset().empty()) - { - throw InvalidArgumentException( - "Invalid quantization for output. Only scale = 1.0f / 256.0f and offset = 0 supported"); - } - - auto layer = std::make_unique(memoryManager); - unsigned int aclAxis = ComputeSoftmaxAclAxis(m_Data.m_Parameters, info.m_InputTensorInfos[0]); - layer->configure(&input, &output, descriptor.m_Parameters.m_Beta, aclAxis); - m_SoftmaxLayer.reset(layer.release()); -} - -void NeonSoftmaxUint8Workload::Execute() const -{ - ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonSoftmaxUint8Workload_Execute"); - - m_SoftmaxLayer->run(); -} - -} //namespace armnn - -- cgit v1.2.1