diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-01-31 10:21:44 +0000 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2020-01-31 15:19:37 +0000 |
| commit | c809a29e5d5bd62fac05c7d6059e1fa409ab4dc1 (patch) | |
| tree | 3db055cc4eb7185d2e5a29720b96b779685c50d8 | |
| parent | 681338fdeb6d45dec6b7407df3551aca9a750ef3 (diff) | |
| download | armnn-c809a29e5d5bd62fac05c7d6059e1fa409ab4dc1.tar.gz | |
IVGCVSW-4388 Update ACL pin to 6a342648ae50beb8457871862f14fc9baef6b74f
!android-nn-driver:2671
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ifeb6be7812fbb98b37f2a1439bfd5a3215de2a62
| -rwxr-xr-x | scripts/get_compute_library.sh | 2 | ||||
| -rw-r--r-- | src/backends/aclCommon/ArmComputeTensorUtils.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scripts/get_compute_library.sh b/scripts/get_compute_library.sh index cbcf800358..7da0711a16 100755 --- a/scripts/get_compute_library.sh +++ b/scripts/get_compute_library.sh @@ -10,7 +10,7 @@ CMD=$( basename $0 ) #DEFAULT_CLFRAMEWORKREVISION="branches/arm_compute_19_11" # Release 19.11 # # For pinning to a revision use this: -DEFAULT_CLFRAMEWORKREVISION="19bd412fd044197726dbd8c756dbd74a9e33fd2b" #COMPMID-3022 Fix NEON QASYMM8 Reduction Operation +DEFAULT_CLFRAMEWORKREVISION="94672fb2af6535adc6ea7fe8b8498580ad8cf3f4" #COMPMID-3003: Integrate assembly kernels utilizing MMLA instruction. usage() { echo "Usage: $CMD (Use the default clframework SHA)" diff --git a/src/backends/aclCommon/ArmComputeTensorUtils.cpp b/src/backends/aclCommon/ArmComputeTensorUtils.cpp index a21de809f7..d2bb6df625 100644 --- a/src/backends/aclCommon/ArmComputeTensorUtils.cpp +++ b/src/backends/aclCommon/ArmComputeTensorUtils.cpp @@ -154,15 +154,18 @@ arm_compute::PoolingLayerInfo BuildArmComputePoolingLayerInfo(const Pooling2dDes using arm_compute::PadStrideInfo; using arm_compute::PoolingLayerInfo; using arm_compute::Size2D; + using arm_compute::DataLayout; // Resolve ARM Compute layer parameters. const PoolingType poolingType = ConvertPoolingAlgorithmToAclPoolingType(descriptor.m_PoolType); + const DataLayout dataLayout = ConvertDataLayout(descriptor.m_DataLayout); + bool isGlobalPooling = (descriptor.m_StrideX==0 && descriptor.m_StrideY==0); //use specific constructor if global pooling if(isGlobalPooling) { - return arm_compute::PoolingLayerInfo(poolingType); + return arm_compute::PoolingLayerInfo(poolingType, dataLayout); } const DimensionRoundingType rounding = ConvertOutputShapeRoundingToAclDimensionRoundingType( @@ -179,7 +182,8 @@ arm_compute::PoolingLayerInfo BuildArmComputePoolingLayerInfo(const Pooling2dDes const Size2D poolSize(descriptor.m_PoolWidth, descriptor.m_PoolHeight); - return arm_compute::PoolingLayerInfo(poolingType, poolSize, padStrideInfo, excludePadding, fpMixedPrecision); + return arm_compute::PoolingLayerInfo(poolingType, poolSize, dataLayout, padStrideInfo, excludePadding, + fpMixedPrecision); } arm_compute::NormalizationLayerInfo BuildArmComputeNormalizationLayerInfo(const NormalizationDescriptor& descriptor) |