From 3b9383548309a8f9121668826a628ec250c57a1c Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Fri, 26 Jul 2019 15:44:17 +0100 Subject: IVGCVSW-3554 Update workloads to pass Softmax Axis Parameter to Backends * Add check in CL and Neon to ensure axis is 1 otherwise return unsupported. * Edit CreateWorkload test and JsonPrinter test to ensure axis of 1. Change-Id: I499b405532e26fefc2dd1c18b6dc6005813b5604 Signed-off-by: Francis Murtagh --- src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/backends/backendsCommon/test') diff --git a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp index 4591def34f..c7870d9672 100644 --- a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp +++ b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp @@ -134,7 +134,13 @@ std::string GetSoftmaxProfilerJson(const std::vector& backends INetworkPtr net(INetwork::Create()); IConnectableLayer* input = net->AddInputLayer(0, "input"); - IConnectableLayer* softmax = net->AddSoftmaxLayer(SoftmaxDescriptor(), "softmax"); + SoftmaxDescriptor softmaxDescriptor; + // Set Axis to 1 if CL or Neon until further Axes are supported. + if ( backends.front() == armnn::Compute::CpuAcc || backends.front() == armnn::Compute::GpuAcc) + { + softmaxDescriptor.m_Axis = 1; + } + IConnectableLayer* softmax = net->AddSoftmaxLayer(softmaxDescriptor, "softmax"); IConnectableLayer* output = net->AddOutputLayer(0, "output"); input->GetOutputSlot(0).Connect(softmax->GetInputSlot(0)); -- cgit v1.2.1