Update ACL pin to 4efe5dc9b39a87eface43e7468e08279976ae9ef
authorTeresa Charlin <teresa.charlinreyes@arm.com>
Wed, 13 May 2020 14:16:12 +0000 (15:16 +0100)
committerTeresa Charlin <teresa.charlinreyes@arm.com>
Wed, 13 May 2020 19:51:13 +0000 (20:51 +0100)
* change neon softmax axis to be int

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

scripts/get_compute_library.sh
src/backends/neon/workloads/NeonSoftmaxWorkload.cpp

index 08218e4ce6cef36062aec98297a418917b233954..7c3299eb514ece596cdf905d01fef7d3141b1ca8 100755 (executable)
@@ -10,7 +10,7 @@ CMD=$( basename $0 )
 #DEFAULT_CLFRAMEWORKREVISION="branches/arm_compute_20_02" # Release 20.02
 #
 # For pinning to a revision use this:
-DEFAULT_CLFRAMEWORKREVISION="6f8b17dedb7b53b550e6210fd1c78c3a3e086271" #[ONCPUML-7] arm_compute support for ND parallelism.
+DEFAULT_CLFRAMEWORKREVISION="4efe5dc9b39a87eface43e7468e08279976ae9ef" # COMPMID-3484: Regression in Transpose convolution Android R CTS test.
 
 usage() {
     echo "Usage: $CMD (Use the default clframework SHA)"
index 35e2e0e3fcd6e784c50e05f196c9106fc518c9c5..b36bf7695f6ecc311c84d02b69b47f3941a5b651 100644 (file)
@@ -23,7 +23,7 @@ arm_compute::Status NeonSoftmaxWorkloadValidate(const TensorInfo& input,
     const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input);
     const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output);
 
-    unsigned int aclAxis = ComputeSoftmaxAclAxis<unsigned int>(descriptor, input);
+    int aclAxis = ComputeSoftmaxAclAxis<int>(descriptor, input);
     return arm_compute::NESoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta, aclAxis);
 }
 
@@ -38,7 +38,7 @@ NeonSoftmaxWorkload::NeonSoftmaxWorkload(const SoftmaxQueueDescriptor& descripto
     arm_compute::ITensor& output = PolymorphicDowncast<IAclTensorHandle*>(m_Data.m_Outputs[0])->GetTensor();
 
     auto layer = std::make_unique<arm_compute::NESoftmaxLayer>(memoryManager);
-    unsigned int aclAxis = ComputeSoftmaxAclAxis<unsigned int>(m_Data.m_Parameters, info.m_InputTensorInfos[0]);
+    int aclAxis = ComputeSoftmaxAclAxis<int>(m_Data.m_Parameters, info.m_InputTensorInfos[0]);
     layer->configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis);
     m_SoftmaxLayer.reset(layer.release());
 }