aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/test/TestNameOnlyLayerVisitor.hpp
diff options
context:
space:
mode:
authorJan Eilers <jan.eilers@arm.com>2021-09-24 15:45:46 +0100
committerJan Eilers <jan.eilers@arm.com>2021-10-02 16:27:39 +0100
commit1b2654fb799c3d25ffcef4d31b5d026d359e2f8f (patch)
tree0397fdf24f286715e26a0e63bddaa0502f64caf7 /src/armnn/test/TestNameOnlyLayerVisitor.hpp
parentb63a31170aee1d28267d83a4bc67b57708fb6b05 (diff)
downloadarmnn-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/TestNameOnlyLayerVisitor.hpp')
-rw-r--r--src/armnn/test/TestNameOnlyLayerVisitor.hpp24
1 files changed, 20 insertions, 4 deletions
diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.hpp b/src/armnn/test/TestNameOnlyLayerVisitor.hpp
index 519cbbacc6..c0db857b71 100644
--- a/src/armnn/test/TestNameOnlyLayerVisitor.hpp
+++ b/src/armnn/test/TestNameOnlyLayerVisitor.hpp
@@ -15,12 +15,28 @@ class Test##name##LayerVisitor : public armnn::TestLayerVisitor \
public: \
explicit Test##name##LayerVisitor(const char* layerName = nullptr) : armnn::TestLayerVisitor(layerName) {}; \
\
- void Visit##name##Layer(const armnn::IConnectableLayer* layer, \
- 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); \
- CheckLayerName(layerName); \
+ armnn::IgnoreUnused(descriptor, constants, id); \
+ switch (layer->GetType()) \
+ { \
+ case armnn::LayerType::name: \
+ { \
+ CheckLayerPointer(layer); \
+ CheckLayerName(layerName); \
+ break; \
+ } \
+ default: \
+ { \
+ m_DefaultStrategy.Apply(GetLayerTypeAsCString(layer->GetType())); \
+ } \
+ } \
} \
+ \
};
} // anonymous namespace