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/backends/cl/test/ClImportTensorHandleTests.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/backends/cl/test/ClImportTensorHandleTests.cpp')
| -rw-r--r-- | src/backends/cl/test/ClImportTensorHandleTests.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backends/cl/test/ClImportTensorHandleTests.cpp b/src/backends/cl/test/ClImportTensorHandleTests.cpp index e10e81ac26..9bfd1fb46d 100644 --- a/src/backends/cl/test/ClImportTensorHandleTests.cpp +++ b/src/backends/cl/test/ClImportTensorHandleTests.cpp @@ -11,7 +11,6 @@ #include <doctest/doctest.h> - #include <armnn/IRuntime.hpp> #include <armnn/INetwork.hpp> #include "Network.hpp" @@ -320,10 +319,13 @@ TEST_CASE_FIXTURE(ClContextControlFixture, "ClForceImportConv2dEndToEnd") convDesc2d.m_PadTop = 1; convDesc2d.m_PadBottom = 1; convDesc2d.m_DataLayout = DataLayout::NHWC; + + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const convLayer = network->AddConvolution2dLayer(convDesc2d, weights, armnn::EmptyOptional(), "conv"); + ARMNN_NO_DEPRECATE_WARN_END ARMNN_ASSERT(convLayer); inputLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(0)); @@ -876,10 +878,12 @@ TEST_CASE_FIXTURE(ClContextControlFixture, "ClForceImportRepeatedInferencesEndTo convDesc2d.m_PadTop = 1; convDesc2d.m_PadBottom = 1; convDesc2d.m_DataLayout = DataLayout::NHWC; + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const convLayer = network->AddConvolution2dLayer(convDesc2d, weights, armnn::EmptyOptional(), "conv"); + ARMNN_NO_DEPRECATE_WARN_END ARMNN_ASSERT(convLayer); inputLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(0)); @@ -1094,10 +1098,12 @@ TEST_CASE_FIXTURE(ClContextControlFixture, "ClForceImportRepeatedInferencesInver convDesc2d.m_PadTop = 1; convDesc2d.m_PadBottom = 1; convDesc2d.m_DataLayout = DataLayout::NHWC; + ARMNN_NO_DEPRECATE_WARN_BEGIN armnn::IConnectableLayer* const convLayer = network->AddConvolution2dLayer(convDesc2d, weights, armnn::EmptyOptional(), "conv"); + ARMNN_NO_DEPRECATE_WARN_END ARMNN_ASSERT(convLayer); inputLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(0)); |