diff options
author | Jan Eilers <jan.eilers@arm.com> | 2021-09-24 15:45:46 +0100 |
---|---|---|
committer | Jan Eilers <jan.eilers@arm.com> | 2021-10-02 16:27:39 +0100 |
commit | 1b2654fb799c3d25ffcef4d31b5d026d359e2f8f (patch) | |
tree | 0397fdf24f286715e26a0e63bddaa0502f64caf7 /src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp | |
parent | b63a31170aee1d28267d83a4bc67b57708fb6b05 (diff) | |
download | armnn-1b2654fb799c3d25ffcef4d31b5d026d359e2f8f.tar.gz |
IVGCVSW-5985 Remove deprecated code
* Removes deprecated AddLayer, IsLayerSupported functions
* Marks the whole LayerVisitor class as deprecated not just the
constructor. This required to wrap all Accept functions in a
no deprecate macro because the LayerVisitor is used as a parameter in
there
* Removes usage of deprecated LayerVisitor and replaces it
with ExecuteStrategy. This required a few structural changes
in the unit tests
* Adds a default implementation for IStrategy called StrategyBase
* Changes pyarmnn to use non deprecated constructor for
INetworkProperties and adds related unit test
* Marks usage of deprecated code in pyarmnn as deprecated. This
required to extend INetworkProperties to allow backwards compatibility
* Removes deprecated functions from CpuAcc, GpuAcc and Ref backends
Note: This patch breaks compatibility with backends that are not
updated in this patch
!android-nn-driver:6325
Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: Id13b6f37a74d26eadeda2da1dc92915e725ed5a5
Diffstat (limited to 'src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp')
-rw-r--r-- | src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp index a3c1420388..b1f9512655 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp @@ -29,15 +29,31 @@ public: \ : armnn::TestLayerVisitor(layerName) \ , m_Descriptor(descriptor) {}; \ \ - void Visit##name##Layer(const armnn::IConnectableLayer* layer, \ - const Descriptor& descriptor, \ - const char* layerName = nullptr) override \ + void ExecuteStrategy(const armnn::IConnectableLayer* layer, \ + const armnn::BaseDescriptor& descriptor, \ + const std::vector<armnn::ConstTensor>& constants, \ + const char* layerName, \ + const armnn::LayerBindingId id = 0) override \ { \ - CheckLayerPointer(layer); \ - CheckDescriptor(descriptor); \ - CheckLayerName(layerName); \ + armnn::IgnoreUnused(descriptor, constants, id); \ + switch (layer->GetType()) \ + { \ + case armnn::LayerType::Input: break; \ + case armnn::LayerType::Output: break; \ + case armnn::LayerType::name: break; \ + { \ + CheckLayerPointer(layer); \ + CheckDescriptor(static_cast<const Descriptor&>(descriptor)); \ + CheckLayerName(layerName); \ + break; \ + } \ + default: \ + { \ + m_DefaultStrategy.Apply(GetLayerTypeAsCString(layer->GetType())); \ + } \ + } \ } \ -}; +}; \ } // anonymous namespace |