diff options
| author | josh minor <josh.minor@arm.com> | 2020-01-06 16:40:46 -0600 |
|---|---|---|
| committer | Derek Lamberti <derek.lamberti@arm.com> | 2020-01-23 14:29:14 +0000 |
| commit | 4a3c61091037e7e86e8b03bb060d8c1ab82731a9 (patch) | |
| tree | 928644023400ad5ac0c26b33dfff2f975567d6e8 /src/armnn/test/CreateWorkload.hpp | |
| parent | 190a39a4a9598e42b636ae4ab843761884148160 (diff) | |
| download | armnn-4a3c61091037e7e86e8b03bb060d8c1ab82731a9.tar.gz | |
IVGCVSW-4259 Add frontend and reference workload for UnaryOperationLayer
* Added new layer named ElementwiseUnary
* Deprecated existing Abs/Rsqrt layer functions
* Updated existing Abs/Rsqrt test infrastructure to use new layer
* Added boilerplate for new Exp,Neg,Sqrt elemwise op layers
* AbsQuantize test removed pending future commit
* Serialization support added
!android-nn-driver:2550
Change-Id: Ic595c645925e17b45db568187fd05646daf2e87f
Signed-off-by: josh minor <josh.minor@arm.com>
Diffstat (limited to 'src/armnn/test/CreateWorkload.hpp')
| -rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index 02ce12a304..4782c432a2 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -131,14 +131,15 @@ std::unique_ptr<WorkloadType> CreateElementwiseWorkloadTest(armnn::IWorkloadFact return workload; } -template <typename WorkloadType, +template <typename WorkloadType, typename DescriptorType, - typename LayerType, armnn::DataType DataType> std::unique_ptr<WorkloadType> CreateElementwiseUnaryWorkloadTest(armnn::IWorkloadFactory & factory, - armnn::Graph & graph) + armnn::Graph & graph, + armnn::UnaryOperation op) { - Layer* const layer = graph.AddLayer<LayerType>("layer"); + ElementwiseUnaryDescriptor desc = ElementwiseUnaryDescriptor(op); + Layer* const layer = graph.AddLayer<armnn::ElementwiseUnaryLayer>(desc, "layer"); Layer* const input = graph.AddLayer<InputLayer>(0, "input"); Layer* const output = graph.AddLayer<OutputLayer>(0, "output"); @@ -1059,34 +1060,6 @@ std::unique_ptr<ResizeWorkload> CreateResizeBilinearWorkloadTest(armnn::IWorkloa return workload; } -template <typename RsqrtWorkload, armnn::DataType DataType> -std::unique_ptr<RsqrtWorkload> CreateRsqrtWorkloadTest(armnn::IWorkloadFactory& factory, - armnn::Graph& graph) -{ - Layer* const layer = graph.AddLayer<RsqrtLayer>("rsqrt"); - - // Creates extra layers. - Layer* const input = graph.AddLayer<InputLayer>(0, "input"); - Layer* const output = graph.AddLayer<OutputLayer>(0, "output"); - - // Connects up. - armnn::TensorInfo tensorInfo({1, 1}, DataType); - - Connect(input, layer, tensorInfo); - Connect(layer, output, tensorInfo); - - CreateTensorHandles(graph, factory); - - // Makes the workload and checks it. - auto workload = MakeAndCheckWorkload<RsqrtWorkload>(*layer, factory); - - RsqrtQueueDescriptor queueDescriptor = workload->GetData(); - BOOST_TEST(queueDescriptor.m_Inputs.size() == 1); - BOOST_TEST(queueDescriptor.m_Outputs.size() == 1); - - return workload; -} - template <typename BatchToSpaceNdWorkload, armnn::DataType DataType> std::unique_ptr<BatchToSpaceNdWorkload> CreateBatchToSpaceNdWorkloadTest(armnn::IWorkloadFactory& factory, armnn::Graph& graph) |