IVGCVSW-3401 Update ACL pin to latest master
* Updated ACL pin to latest master.
* Minor changes to Softmax Neon/CL uint8
workloads to reflect refactoring in ACL.
!android-nn-driver:1476
Change-Id: I1c5005ddbcccdb41d8cb09d3fa61cf3ce0e9ffdb
Signed-off-by: James Conroy <james.conroy@arm.com>
diff --git a/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp b/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp
index 84d735c..ce2a9e6 100644
--- a/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp
+++ b/src/backends/cl/workloads/ClSoftmaxUint8Workload.cpp
@@ -25,10 +25,9 @@
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()))
+ 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");
diff --git a/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp b/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp
index d1e49d9..363c150 100644
--- a/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp
+++ b/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp
@@ -25,10 +25,9 @@
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()))
+ 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");