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/ShapeInferenceTests.cpp | |
| 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/ShapeInferenceTests.cpp')
| -rw-r--r-- | src/armnn/test/ShapeInferenceTests.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/armnn/test/ShapeInferenceTests.cpp b/src/armnn/test/ShapeInferenceTests.cpp index d45c9900c0..a3800ade09 100644 --- a/src/armnn/test/ShapeInferenceTests.cpp +++ b/src/armnn/test/ShapeInferenceTests.cpp @@ -275,8 +275,6 @@ TEST_CASE("Convolution2dTest") { const TensorShape inputShape{1, 1, 10, 10}; - Graph graph; - Convolution2dDescriptor descriptor; descriptor.m_PadLeft = 0; @@ -288,16 +286,9 @@ TEST_CASE("Convolution2dTest") descriptor.m_DilationX = 3; descriptor.m_DilationY = 3; - auto layer = BuildGraph<Convolution2dLayer>(&graph, - {inputShape}, - descriptor, - "conv2d"); - - const float Datum = 0.0f; - ConstTensor weights({{1, 1, 3, 3}, DataType::Float32, 0.0f, 0, true}, &Datum); - layer->m_Weight = std::make_unique<ScopedTensorHandle>(weights); - - RunShapeInferenceTest<Convolution2dLayer>(layer, {{ 1, 1, 4, 4 }}); + CreateGraphAndRunTest<Convolution2dLayer>({ inputShape, { 1, 1, 3, 3 } }, + { { 1, 1, 4, 4 } }, descriptor, + "convd"); } TEST_CASE("DebugLayerTest") |