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/armnn/test/optimizations/FuseActivationTests.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/armnn/test/optimizations/FuseActivationTests.cpp')
| -rw-r--r-- | src/armnn/test/optimizations/FuseActivationTests.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/armnn/test/optimizations/FuseActivationTests.cpp b/src/armnn/test/optimizations/FuseActivationTests.cpp index e5f54208f0..0cca86f93b 100644 --- a/src/armnn/test/optimizations/FuseActivationTests.cpp +++ b/src/armnn/test/optimizations/FuseActivationTests.cpp @@ -42,7 +42,7 @@ struct Convolution2dTest { using LayerType = Convolution2dLayer; static const bool isElementWise = false; - static const bool isConstTensorAsInputSupported = false; + static const bool isConstTensorAsInputSupported = true; static TensorShape GetInputShape() { return TensorShape( {1, 4, 4, 3}); } // NHWCin static TensorShape GetOutputShape() { return TensorShape( {1, 3, 3, 4}); } // NHWCout @@ -69,8 +69,9 @@ struct Convolution2dTest TensorInfo weightsInfo(GetWeightsShape(), ArmnnType, scale, offset, true); ConstTensor weights(weightsInfo, weightsVector); Optional<ConstTensor> optionalBias; - + ARMNN_NO_DEPRECATE_WARN_BEGIN return network->AddConvolution2dLayer(descriptor, weights, optionalBias, name); + ARMNN_NO_DEPRECATE_WARN_END } static std::vector<IConnectableLayer*> AddConstantLayers(INetwork* network, |