diff options
author | Keith Davis <keith.davis@arm.com> | 2022-04-07 11:32:00 +0100 |
---|---|---|
committer | Keith Davis <keith.davis@arm.com> | 2022-05-16 16:08:54 +0100 |
commit | b4dd5cc86d4eb841de670f0f102ede599e0d9c40 (patch) | |
tree | 77857cf739baecaf63701b66c1a2646b7930a834 /src/armnnTestUtils/CommonTestUtils.cpp | |
parent | b86ec6641b4b06ccddad5eebbc21010d6184fe79 (diff) | |
download | armnn-b4dd5cc86d4eb841de670f0f102ede599e0d9c40.tar.gz |
IVGCVSW-6124 ConstTensorsAsInput: Conv2d - FrontEnd
* Update Front-end and Tools.
* Updated Serializer, Deserializer and unit tests to reflect this.
* Updated TfLiteDelegate, TfLiteParser and OnnxParser.
* Updated Ref.
* Fixed resulting Neon / CL tests
* Unified optimizers for conv2d ops
* Optimizer Fix - Fp32ToBf16
* Partial implementation for ACL backends to fix VTS failures
!android-nn-driver:7477
Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I5fb18877f7ee32643e15a9818945356274bb401b
Diffstat (limited to 'src/armnnTestUtils/CommonTestUtils.cpp')
-rw-r--r-- | src/armnnTestUtils/CommonTestUtils.cpp | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/src/armnnTestUtils/CommonTestUtils.cpp b/src/armnnTestUtils/CommonTestUtils.cpp index c85330577d..472716c97c 100644 --- a/src/armnnTestUtils/CommonTestUtils.cpp +++ b/src/armnnTestUtils/CommonTestUtils.cpp @@ -9,16 +9,43 @@ using namespace armnn; -SubgraphView::InputSlots CreateInputsFrom(const std::vector<Layer*>& layers) +SubgraphView::InputSlots CreateInputsFrom(Layer* layer, + std::vector<unsigned int> ignoreSlots) { SubgraphView::InputSlots result; - for (auto&& layer : layers) + for (auto&& it = layer->BeginInputSlots(); it != layer->EndInputSlots(); ++it) { - for (auto&& it = layer->BeginInputSlots(); it != layer->EndInputSlots(); ++it) + if (std::find(ignoreSlots.begin(), ignoreSlots.end(), it->GetSlotIndex()) != ignoreSlots.end()) + { + continue; + } + else { result.push_back(&(*it)); } } + return result; +} + +// ignoreSlots assumes you want to ignore the same slots all on layers within the vector +SubgraphView::InputSlots CreateInputsFrom(const std::vector<Layer*>& layers, + std::vector<unsigned int> ignoreSlots) +{ + SubgraphView::InputSlots result; + for (auto&& layer: layers) + { + for (auto&& it = layer->BeginInputSlots(); it != layer->EndInputSlots(); ++it) + { + if (std::find(ignoreSlots.begin(), ignoreSlots.end(), it->GetSlotIndex()) != ignoreSlots.end()) + { + continue; + } + else + { + result.push_back(&(*it)); + } + } + } return result; } |