diff options
| author | Keith Davis <keith.davis@arm.com> | 2022-04-07 11:32:00 +0100 |
|---|---|---|
| committer | Ryan OShea <ryan.oshea3@arm.com> | 2022-05-19 11:05:15 +0100 |
| commit | 2cddc72f7aa1eab43c69250e608d662909383ba7 (patch) | |
| tree | 62c531bb82b96c14469c151c3738e1e0383e5972 /src/armnn/test/ConstTensorLayerVisitor.hpp | |
| parent | 85edad42b8b76e76c5d969e4bc380b0e8a845c9b (diff) | |
| download | armnn-2cddc72f7aa1eab43c69250e608d662909383ba7.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/armnn/test/ConstTensorLayerVisitor.hpp')
| -rw-r--r-- | src/armnn/test/ConstTensorLayerVisitor.hpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/armnn/test/ConstTensorLayerVisitor.hpp b/src/armnn/test/ConstTensorLayerVisitor.hpp index 00d17b4ae8..1f1b3f5262 100644 --- a/src/armnn/test/ConstTensorLayerVisitor.hpp +++ b/src/armnn/test/ConstTensorLayerVisitor.hpp @@ -21,22 +21,18 @@ class TestConvolution2dLayerVisitor : public TestLayerVisitor { public: explicit TestConvolution2dLayerVisitor(const Convolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const Optional<ConstTensor>& biases, const char* name = nullptr) : TestLayerVisitor(name) , m_Descriptor(convolution2dDescriptor) - , m_Weights(weights) - , m_Biases(biases) {} virtual ~TestConvolution2dLayerVisitor() {} void ExecuteStrategy(const armnn::IConnectableLayer* layer, - const armnn::BaseDescriptor& descriptor, - const std::vector<armnn::ConstTensor>& constants, - const char* name, - const armnn::LayerBindingId id = 0) override + const armnn::BaseDescriptor& descriptor, + const std::vector<armnn::ConstTensor>& constants, + const char* name, + const armnn::LayerBindingId id = 0) override { armnn::IgnoreUnused(descriptor, constants, id); switch (layer->GetType()) @@ -46,12 +42,6 @@ public: CheckLayerPointer(layer); CheckLayerName(name); CheckDescriptor(static_cast<const armnn::Convolution2dDescriptor&>(descriptor)); - CheckConstTensors(m_Weights, constants[0]); - if (m_Biases.has_value()) - { - CHECK(constants.size() == 2); - CheckConstTensors(m_Biases.value(), constants[1]); - } break; } default: @@ -66,8 +56,6 @@ protected: private: Convolution2dDescriptor m_Descriptor; - ConstTensor m_Weights; - Optional<ConstTensor> m_Biases; }; class TestDepthwiseConvolution2dLayerVisitor : public TestLayerVisitor |