diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2019-07-26 15:44:17 +0100 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2019-07-26 15:44:17 +0100 |
| commit | 3b9383548309a8f9121668826a628ec250c57a1c (patch) | |
| tree | 01cc4e162008aea23bfe9ae167ded0e8f9abc39c /src/armnn/test/CreateWorkload.hpp | |
| parent | 82b15eda6f87a20bc31256f5e85eb4082d3d0591 (diff) | |
| download | armnn-3b9383548309a8f9121668826a628ec250c57a1c.tar.gz | |
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 <francis.murtagh@arm.com>
Diffstat (limited to 'src/armnn/test/CreateWorkload.hpp')
| -rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index 4181db26d0..619c6d02cd 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -617,8 +617,13 @@ std::unique_ptr<SoftmaxWorkload> CreateSoftmaxWorkloadTest(armnn::IWorkloadFacto { // Create the layer we're testing. SoftmaxDescriptor softmaxDescriptor; - Layer* const layer = graph.AddLayer<SoftmaxLayer>(softmaxDescriptor, "layer"); + // Set Axis to 1 if CL or Neon until further Axes are supported. + if (factory.GetBackendId() == armnn::Compute::CpuAcc || factory.GetBackendId() == armnn::Compute::GpuAcc) + { + softmaxDescriptor.m_Axis = 1; + } + Layer* const layer = graph.AddLayer<SoftmaxLayer>(softmaxDescriptor, "layer"); // Create extra layers. Layer* const input = graph.AddLayer<InputLayer>(0, "input"); Layer* const output = graph.AddLayer<OutputLayer>(0, "output"); |