diff options
author | David Monahan <david.monahan@arm.com> | 2020-06-30 15:57:56 +0100 |
---|---|---|
committer | David Monahan <david.monahan@arm.com> | 2020-07-08 12:02:26 +0000 |
commit | 9b14bfc3f3131d05e2aaf88f85a9a101f2a3e70a (patch) | |
tree | dd7e94e123c93997f922e152047a247e0e931fd3 /src/backends/backendsCommon/test | |
parent | e4112637b5057f638c3d147a1751ed01772be48a (diff) | |
download | armnn-9b14bfc3f3131d05e2aaf88f85a9a101f2a3e70a.tar.gz |
IVGCVSW-5005 Fix Deprecated Functions in CL/NEON Resize Workload
* Update CL pin to f3ad9513dd46fca1d6c5e4550286480fdbaba056
IVGCVSW-5005: Fix Deprecated Functions in CL/NEON Resize Workload
* Add missing virtual function to NeonIntercepterScheduler
* Update CL/Neon Resize Workloads to use ScaleKernelInfo
* Update CL/Neon Resize workloads to set correct Sampling Policy for Half Pixels
IVGCVSW-4981: Change CL/NEON Softmax axis value
* Default value is now 0
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I8a14c6a64e5a24bc1a66a7d3685cd388c2245702
Diffstat (limited to 'src/backends/backendsCommon/test')
-rw-r--r-- | src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp | 4 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp index 50dc61b1f4..6251507e51 100644 --- a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp +++ b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp @@ -134,10 +134,10 @@ std::string GetSoftmaxProfilerJson(const std::vector<armnn::BackendId>& backends IConnectableLayer* input = net->AddInputLayer(0, "input"); SoftmaxDescriptor softmaxDescriptor; - // Set Axis to 1 if CL or Neon until further Axes are supported. + // Set Axis to 0 if CL or Neon until further Axes are supported. if ( backends.front() == armnn::Compute::CpuAcc || backends.front() == armnn::Compute::GpuAcc) { - softmaxDescriptor.m_Axis = 1; + softmaxDescriptor.m_Axis = 0; } IConnectableLayer* softmax = net->AddSoftmaxLayer(softmaxDescriptor, "softmax"); IConnectableLayer* output = net->AddOutputLayer(0, "output"); diff --git a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp index 953b543acb..fa7ab90b16 100644 --- a/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/SoftmaxTestImpl.cpp @@ -63,7 +63,7 @@ LayerTestResult<T, n> SimpleSoftmaxBaseTestImpl( const armnn::TensorShape& inputShape, const std::vector<float>& outputData, const std::vector<float>& inputData, - int axis = 1) + int axis = -1) { IgnoreUnused(memoryManager); using std::exp; |