diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-07-16 12:44:16 +0100 |
|---|---|---|
| committer | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-07-22 18:10:16 +0100 |
| commit | 552ee4db04fce46bec1a6ae99bee300e434768de (patch) | |
| tree | 064f31bc459b6ba8bfc7519236d7e072844022a5 | |
| parent | 2adf5f07081719e27870c5d461698e3153e0e74a (diff) | |
| download | armnn-552ee4db04fce46bec1a6ae99bee300e434768de.tar.gz | |
Update ACL pin to aa95ddc2abb7cef0b2edd03f7c4c9d9c6b9d7cf4
IVGCVSW-5136 Adapt to change in ConcatenateLayer in ACL
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I5bc1752215a7b5a91c449e62809ae06f501c6108
| -rwxr-xr-x | scripts/get_compute_library.sh | 2 | ||||
| -rw-r--r-- | src/backends/cl/workloads/ClConcatWorkload.cpp | 4 | ||||
| -rw-r--r-- | src/backends/neon/workloads/NeonConcatWorkload.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/get_compute_library.sh b/scripts/get_compute_library.sh index 14c0fcc91a..964e441e5b 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_20_05" # Release 20.05 # # For pinning to a revision use this: -DEFAULT_CLFRAMEWORKREVISION="6b6a16faa9375365d444b2a3998381b22cd6cd5b" #COMPMID-3501 Modify heuristics for f16+fastmath NEON Winograd Conv +DEFAULT_CLFRAMEWORKREVISION="40aad9bbbae5308d7302e61e1372328c9b5daf99" #COMPMID-3600: Fix requantization in NEPixelWiseMultiplicationKernel usage() { echo "Usage: $CMD (Use the default clframework SHA)" diff --git a/src/backends/cl/workloads/ClConcatWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp index e0aebd30cb..da0d675232 100644 --- a/src/backends/cl/workloads/ClConcatWorkload.cpp +++ b/src/backends/cl/workloads/ClConcatWorkload.cpp @@ -36,7 +36,7 @@ arm_compute::Status ClConcatWorkloadValidate(const std::vector<const TensorInfo* aclInputs.emplace_back(aclInputInfo); } const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output); - std::vector<arm_compute::ITensorInfo*> aclInputPtrs; + std::vector<const arm_compute::ITensorInfo*> aclInputPtrs; for (arm_compute::ITensorInfo& input : aclInputs) { aclInputPtrs.emplace_back(&input); @@ -68,7 +68,7 @@ ClConcatWorkload::ClConcatWorkload(const ConcatQueueDescriptor& descriptor, cons return; } - std::vector<arm_compute::ICLTensor *> aclInputs; + std::vector<const arm_compute::ICLTensor *> aclInputs; for (auto input : m_Data.m_Inputs) { arm_compute::ICLTensor& aclInput = armnn::PolymorphicPointerDowncast<IClTensorHandle>(input)->GetTensor(); diff --git a/src/backends/neon/workloads/NeonConcatWorkload.cpp b/src/backends/neon/workloads/NeonConcatWorkload.cpp index 65678aae59..a8f6dbed23 100644 --- a/src/backends/neon/workloads/NeonConcatWorkload.cpp +++ b/src/backends/neon/workloads/NeonConcatWorkload.cpp @@ -36,7 +36,7 @@ arm_compute::Status NeonConcatWorkloadValidate(const std::vector<const TensorInf aclInputs.emplace_back(aclInputInfo); } const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output); - std::vector<arm_compute::ITensorInfo*> aclInputPtrs; + std::vector<const arm_compute::ITensorInfo*> aclInputPtrs; for (arm_compute::ITensorInfo& input : aclInputs) { aclInputPtrs.emplace_back(&input); @@ -69,7 +69,7 @@ const ConcatQueueDescriptor& descriptor, const WorkloadInfo& info) return; } - std::vector<arm_compute::ITensor *> aclInputs; + std::vector<const arm_compute::ITensor *> aclInputs; for (auto input : m_Data.m_Inputs) { arm_compute::ITensor& aclInput = armnn::PolymorphicPointerDowncast<IAclTensorHandle>(input)->GetTensor(); |