diff options
| author | Matthew Bentham <matthew.bentham@arm.com> | 2019-01-22 17:26:59 +0000 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2019-01-22 17:28:16 +0000 |
| commit | 0edd46737065d3e5c09aa959807e81f9836ee709 (patch) | |
| tree | bc4a11cedb9e13c2996f16e54689840da1cfe378 /src/armnnTfLiteParser | |
| parent | 9c761a6335f58901bef01b33f1127f9fae3b2bf3 (diff) | |
| download | armnn-0edd46737065d3e5c09aa959807e81f9836ee709.tar.gz | |
Fix compilation wrt IVGCVSW-2467
Change-Id: I073473774e302c2d77e717e1ad718594ce1b5feb
Diffstat (limited to 'src/armnnTfLiteParser')
| -rw-r--r-- | src/armnnTfLiteParser/test/Multiplication.cpp | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/src/armnnTfLiteParser/test/Multiplication.cpp b/src/armnnTfLiteParser/test/Multiplication.cpp index dabf868559..329649a6cb 100644 --- a/src/armnnTfLiteParser/test/Multiplication.cpp +++ b/src/armnnTfLiteParser/test/Multiplication.cpp @@ -94,18 +94,19 @@ struct SimpleMultiplicationFixture : public MultiplicationFixture BOOST_FIXTURE_TEST_CASE(ParseMultiplication, SimpleMultiplicationFixture) { - RunTest<4, armnn::DataType::Float32>(0, {{ "inputTensor1", { 0.0f, 1.0f, 2.0f, - 3.0f, 4.0f, 5.0f, - 6.0f, 7.0f, 8.0f, - 9.0f, 10.0f, 11.0f } }, - { "inputTensor2", { 1.0f, 1.0f, 1.0f, - 5.0f, 5.0f, 5.0f, - 1.0f, 1.0f, 1.0f, - 5.0f, 5.0f, 5.0f} } }, - {{ "outputTensor", { 0.0f, 1.0f, 2.0f, - 15.0f, 20.0f, 25.0f, - 6.0f, 7.0f, 8.0f, - 45.0f, 50.0f, 55.0f } } }); + using armnn::DataType; + RunTest<4, DataType::Float32>(0, {{ "inputTensor1", { 0.0f, 1.0f, 2.0f, + 3.0f, 4.0f, 5.0f, + 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f } }, + { "inputTensor2", { 1.0f, 1.0f, 1.0f, + 5.0f, 5.0f, 5.0f, + 1.0f, 1.0f, 1.0f, + 5.0f, 5.0f, 5.0f} } }, + {{ "outputTensor", { 0.0f, 1.0f, 2.0f, + 15.0f, 20.0f, 25.0f, + 6.0f, 7.0f, 8.0f, + 45.0f, 50.0f, 55.0f } } }); } struct MultiplicationBroadcastFixture4D1D : public MultiplicationFixture @@ -115,15 +116,16 @@ struct MultiplicationBroadcastFixture4D1D : public MultiplicationFixture BOOST_FIXTURE_TEST_CASE(ParseMultiplicationBroadcast4D1D, MultiplicationBroadcastFixture4D1D) { - RunTest<4, float>(0, {{ "inputTensor1", { 0.0f, 1.0f, 2.0f, - 3.0f, 4.0f, 5.0f, - 6.0f, 7.0f, 8.0f, - 9.0f, 10.0f, 11.0f } }, - { "inputTensor2", { 5.0f } } }, - {{ "outputTensor", { 0.0f, 5.0f, 10.0f, - 15.0f, 20.0f, 25.0f, - 30.0f, 35.0f, 40.0f, - 45.0f, 50.0f, 55.0f } } }); + using armnn::DataType; + RunTest<4, DataType::Float32>(0, {{ "inputTensor1", { 0.0f, 1.0f, 2.0f, + 3.0f, 4.0f, 5.0f, + 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f } }, + { "inputTensor2", { 5.0f } } }, + {{ "outputTensor", { 0.0f, 5.0f, 10.0f, + 15.0f, 20.0f, 25.0f, + 30.0f, 35.0f, 40.0f, + 45.0f, 50.0f, 55.0f } } }); } struct MultiplicationBroadcastFixture1D4D : public MultiplicationFixture @@ -133,15 +135,16 @@ struct MultiplicationBroadcastFixture1D4D : public MultiplicationFixture BOOST_FIXTURE_TEST_CASE(ParseMultiplicationBroadcast1D4D, MultiplicationBroadcastFixture1D4D) { - RunTest<4, float>(0, {{ "inputTensor1", { 3.0f } }, - { "inputTensor2", { 0.0f, 1.0f, 2.0f, - 3.0f, 4.0f, 5.0f, - 6.0f, 7.0f, 8.0f, - 9.0f, 10.0f, 11.0f } } }, - {{ "outputTensor", { 0.0f, 3.0f, 6.0f, - 9.0f, 12.0f, 15.0f, - 18.0f, 21.0f, 24.0f, - 27.0f, 30.0f, 33.0f } } }); + using armnn::DataType; + RunTest<4, DataType::Float32>(0, {{ "inputTensor1", { 3.0f } }, + { "inputTensor2", { 0.0f, 1.0f, 2.0f, + 3.0f, 4.0f, 5.0f, + 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f } } }, + {{ "outputTensor", { 0.0f, 3.0f, 6.0f, + 9.0f, 12.0f, 15.0f, + 18.0f, 21.0f, 24.0f, + 27.0f, 30.0f, 33.0f } } }); } BOOST_AUTO_TEST_SUITE_END() |