diff options
author | Giorgio Arena <giorgio.arena@arm.com> | 2020-10-23 14:24:26 +0100 |
---|---|---|
committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-10-23 15:38:25 +0000 |
commit | 4112eed70d110376674609af92e76c68ae8b3a39 (patch) | |
tree | 8b933e67ec3cfb9c17fbbb0dc84f8082871a3e82 /src/core/Utils.cpp | |
parent | 69153b3744542691cc205bafda3bbc9c84d394ce (diff) | |
download | ComputeLibrary-4112eed70d110376674609af92e76c68ae8b3a39.tar.gz |
COMPMID-3731 Remove OpenCL padding: CLHeightConcatenateLayerKernel
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Change-Id: I004128fdcc1207c25d2b959f17f04f9e1a8b4cb5
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4247
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'src/core/Utils.cpp')
-rw-r--r-- | src/core/Utils.cpp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/core/Utils.cpp b/src/core/Utils.cpp index c877e8fd1f..babf1c4b91 100644 --- a/src/core/Utils.cpp +++ b/src/core/Utils.cpp @@ -495,26 +495,41 @@ std::pair<int32_t, int32_t> get_quantized_activation_min_max(ActivationLayerInfo return std::make_pair(min_activation, max_activation); } -std::unordered_map<const ITensor *, PaddingSize> get_padding_info(std::initializer_list<const ITensor *> tensors) +std::unordered_map<const ITensorInfo *, PaddingSize> get_padding_info(std::initializer_list<const ITensor *> tensors) { - std::unordered_map<const ITensor *, PaddingSize> res; + std::unordered_map<const ITensorInfo *, PaddingSize> res; for(const ITensor *tensor : tensors) { if(tensor) { - res.insert({ tensor, tensor->info()->padding() }); + res.insert({ tensor->info(), tensor->info()->padding() }); } } return res; } -bool has_padding_changed(const std::unordered_map<const ITensor *, PaddingSize> &padding_map) +std::unordered_map<const ITensorInfo *, PaddingSize> get_padding_info(std::initializer_list<const ITensorInfo *> infos) { - return std::find_if(padding_map.begin(), padding_map.end(), [](const std::pair<const ITensor *, PaddingSize> &padding_info) + std::unordered_map<const ITensorInfo *, PaddingSize> res; + + for(const ITensorInfo *info : infos) + { + if(info) + { + res.insert({ info, info->padding() }); + } + } + + return res; +} + +bool has_padding_changed(const std::unordered_map<const ITensorInfo *, PaddingSize> &padding_map) +{ + return std::find_if(padding_map.begin(), padding_map.end(), [](const std::pair<const ITensorInfo *, PaddingSize> &padding_info) { - return (padding_info.first->info()->padding() != padding_info.second); + return (padding_info.first->padding() != padding_info.second); }) != padding_map.end(); } |