Update the CL pin to the latest master

 * Updated the pinned CL revision
 * Changed the type for axis in L2Norm workloads

!clframework:d7dd15c445397ab879439de6659859db09f4b752
!android-nn-driver:1268

Change-Id: Ib568869ae8259c4c7d62fc8b434c74a7f8242988
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>

diff --git a/scripts/get_compute_library.sh b/scripts/get_compute_library.sh
index 39de20c..391168a 100755 (executable)
--- a/scripts/get_compute_library.sh
+++ b/scripts/get_compute_library.sh
@@ -7,10 +7,10 @@
 CMD=$( basename $0 )
 
 # For pinnning to a ref use this:
-DEFAULT_CLFRAMEWORKREVISION="branches/arm_compute_19_05" # Release 19.05
+#DEFAULT_CLFRAMEWORKREVISION="branches/arm_compute_19_05" # Release 19.05
 #
 # For pinning to a revision use this:
-# DEFAULT_CLFRAMEWORKREVISION="050471e40fc58cb5ea745701a43ec5b2b9586b81"
+DEFAULT_CLFRAMEWORKREVISION="d7dd15c445397ab879439de6659859db09f4b752"
 
 usage() {
     echo "Usage: $CMD (Use the default clframework SHA)"

diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp
index 2226e09..6ba7ccd 100644 (file)
--- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp
+++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp
@@ -21,7 +21,7 @@ arm_compute::Status ClL2NormalizationWorkloadValidate(const TensorInfo& input,
     const arm_compute::TensorInfo aclInput  = BuildArmComputeTensorInfo(input, descriptor.m_DataLayout);
     const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout);
 
-    unsigned int axis = (descriptor.m_DataLayout == DataLayout::NCHW) ? 2 : 0;
+    int axis = (descriptor.m_DataLayout == DataLayout::NCHW) ? 2 : 0;
 
     return arm_compute::CLL2NormalizeLayer::validate(&aclInput, &aclOutput, axis);
 }
@@ -39,7 +39,7 @@ ClL2NormalizationFloatWorkload::ClL2NormalizationFloatWorkload(const L2Normaliza
     input.info()->set_data_layout(aclDataLayout);
     output.info()->set_data_layout(aclDataLayout);
 
-    unsigned int axis = (m_Data.m_Parameters.m_DataLayout == DataLayout::NCHW) ? 2 : 0;
+    int axis = (m_Data.m_Parameters.m_DataLayout == DataLayout::NCHW) ? 2 : 0;
 
     m_Layer.configure(&input, &output, axis);
 }

diff --git a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp
index 99bbcfa..efc21ed 100644 (file)
--- a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp
+++ b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp
@@ -22,7 +22,7 @@ arm_compute::Status NeonL2NormalizationWorkloadValidate(const TensorInfo& input,
     const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input, descriptor.m_DataLayout);
     const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout);
 
-    unsigned int axis = (descriptor.m_DataLayout == DataLayout::NCHW) ? 2 : 0;
+    int axis = (descriptor.m_DataLayout == DataLayout::NCHW) ? 2 : 0;
 
     return arm_compute::NEL2NormalizeLayer::validate(&aclInput, &aclOutput, axis);
 }
@@ -40,7 +40,7 @@ NeonL2NormalizationFloatWorkload::NeonL2NormalizationFloatWorkload(const L2Norma
     input.info()->set_data_layout(aclDataLayout);
     output.info()->set_data_layout(aclDataLayout);
 
-    unsigned int axis = (m_Data.m_Parameters.m_DataLayout == DataLayout::NCHW) ? 2 : 0;
+    int axis = (m_Data.m_Parameters.m_DataLayout == DataLayout::NCHW) ? 2 : 0;
 
     auto layer = std::make_unique<arm_compute::NEL2NormalizeLayer>(memoryManager);
     layer->configure(&input, &output, axis);