diff options
Diffstat (limited to 'src/armnn/backends')
-rw-r--r-- | src/armnn/backends/RefWorkloads/Division.cpp | 41 | ||||
-rw-r--r-- | src/armnn/backends/test/LayerTests.cpp | 30 | ||||
-rw-r--r-- | src/armnn/backends/test/LayerTests.hpp | 1 | ||||
-rw-r--r-- | src/armnn/backends/test/Reference.cpp | 1 |
4 files changed, 71 insertions, 2 deletions
diff --git a/src/armnn/backends/RefWorkloads/Division.cpp b/src/armnn/backends/RefWorkloads/Division.cpp index 9837fea6b4..9c1142226c 100644 --- a/src/armnn/backends/RefWorkloads/Division.cpp +++ b/src/armnn/backends/RefWorkloads/Division.cpp @@ -8,6 +8,8 @@ #include <functional> +#include <cmath> + namespace { @@ -18,8 +20,43 @@ void ElementwiseDivision(unsigned int numElements, { for (unsigned int i = 0; i < numElements; ++i) { - //TODO How to handle divide by 0 - outData[i] = inData0[i] / inData1[i]; + if (inData1[i] != 0.0f) + { + outData[i] = inData0[i] / inData1[i]; + } + else if (inData0[i] == 0.0f) + { + if (!std::signbit(inData1[i])) + { + outData[i]= NAN; + } + else + { + outData[i]= -NAN; + } + } + else if (inData0[i] < 0.0f) + { + if (!std::signbit(inData1[i])) + { + outData[i] = -INFINITY; + } + else + { + outData[i] = INFINITY; + } + } + else + { + if (!std::signbit(inData1[i])) + { + outData[i] = INFINITY; + } + else + { + outData[i] = -INFINITY; + } + } } } diff --git a/src/armnn/backends/test/LayerTests.cpp b/src/armnn/backends/test/LayerTests.cpp index e916c05397..36a2ad8717 100644 --- a/src/armnn/backends/test/LayerTests.cpp +++ b/src/armnn/backends/test/LayerTests.cpp @@ -1117,6 +1117,36 @@ namespace { } } // anonymous namespace +LayerTestResult<float,4> DivisionByZeroTest(armnn::IWorkloadFactory& workloadFactory) +{ + const unsigned int width = 2; + const unsigned int height = 2; + const unsigned int channelCount = 2; + const unsigned int batchSize = 2; + + unsigned int shape[] = { batchSize, channelCount, height, width }; + + std::vector<float> input0({ + 1.f, 1.f, 1.f, 1.f, 0.f, 0.f, 0.f, 0.f, + -1.f, -1.f, -1.f, -1.f, 5.f, 5.f, 5.f, 5.f }); + + std::vector<float> input1({ + 0.f, 0.f, -0.f, -0.f, 0.f, 0.f, -0.f, -0.f, + 0.f, 0.f, -0.f, -0.f, 5.f, 5.f, 5.f, 5.f }); + + std::vector<float> output({ + INFINITY, INFINITY, -INFINITY, -INFINITY, NAN, NAN, -NAN, -NAN, + -INFINITY, -INFINITY, INFINITY, INFINITY, 1, 1, 1, 1 }); + + return DivisionTestHelper(workloadFactory, + shape, + input0, + shape, + input1, + shape, + output); +} + LayerTestResult<float,4> DivisionTest(armnn::IWorkloadFactory& workloadFactory) { const unsigned int width = 2; diff --git a/src/armnn/backends/test/LayerTests.hpp b/src/armnn/backends/test/LayerTests.hpp index a59ff05c90..b74cad296c 100644 --- a/src/armnn/backends/test/LayerTests.hpp +++ b/src/armnn/backends/test/LayerTests.hpp @@ -193,6 +193,7 @@ LayerTestResult<float, 4> CompareActivationTest(armnn::IWorkloadFactory& worklo unsigned int batchSize); LayerTestResult<float, 4> DivisionTest(armnn::IWorkloadFactory& workloadFactory); +LayerTestResult<float, 4> DivisionByZeroTest(armnn::IWorkloadFactory& workloadFactory); LayerTestResult<float, 4> DivisionBroadcast1ElementTest(armnn::IWorkloadFactory& workloadFactory); LayerTestResult<float, 4> DivisionBroadcast1DVectorTest(armnn::IWorkloadFactory& workloadFactory); diff --git a/src/armnn/backends/test/Reference.cpp b/src/armnn/backends/test/Reference.cpp index b31723c3a3..e19e4d5a2f 100644 --- a/src/armnn/backends/test/Reference.cpp +++ b/src/armnn/backends/test/Reference.cpp @@ -148,6 +148,7 @@ ARMNN_AUTO_TEST_CASE(AddBroadcast1ElementUint8, AdditionBroadcast1ElementUint8Te // Div ARMNN_AUTO_TEST_CASE(SimpleDivision, DivisionTest) +ARMNN_AUTO_TEST_CASE(DivisionByZero, DivisionByZeroTest) ARMNN_AUTO_TEST_CASE(DivisionBroadcast1Element, DivisionBroadcast1ElementTest) ARMNN_AUTO_TEST_CASE(DivisionBroadcast1DVector, DivisionBroadcast1DVectorTest) |