diff options
| author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-01-22 16:10:44 +0000 |
|---|---|---|
| committer | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-01-22 16:10:44 +0000 |
| commit | 649dd9515ddf4bd00a0bff64d51dfd835a6c7b39 (patch) | |
| tree | c938bc8eb11dd24223c0cb00a57d4372a907b943 /src/armnnTfLiteParser/test/Concatenation.cpp | |
| parent | 382e21ce95c04479a6900afca81a57949b369f1e (diff) | |
| download | armnn-649dd9515ddf4bd00a0bff64d51dfd835a6c7b39.tar.gz | |
IVGCVSW-2467 Remove GetDataType<T> function
Change-Id: I7359617a307b9abb4c30b3d5f2364dc6d0f828f0
Diffstat (limited to 'src/armnnTfLiteParser/test/Concatenation.cpp')
| -rw-r--r-- | src/armnnTfLiteParser/test/Concatenation.cpp | 97 |
1 files changed, 51 insertions, 46 deletions
diff --git a/src/armnnTfLiteParser/test/Concatenation.cpp b/src/armnnTfLiteParser/test/Concatenation.cpp index 8629efe3d7..bb5aebf39c 100644 --- a/src/armnnTfLiteParser/test/Concatenation.cpp +++ b/src/armnnTfLiteParser/test/Concatenation.cpp @@ -100,10 +100,11 @@ struct ConcatenationFixtureNegativeDim : ConcatenationFixture BOOST_FIXTURE_TEST_CASE(ParseConcatenationNegativeDim, ConcatenationFixtureNegativeDim) { - RunTest<4, uint8_t>(0, - {{"inputTensor1", { 0, 1, 2, 3 }}, - {"inputTensor2", { 4, 5, 6, 7 }}}, - {{"outputTensor", { 0, 1, 2, 3, 4, 5, 6, 7 }}}); + RunTest<4, armnn::DataType::QuantisedAsymm8>( + 0, + {{"inputTensor1", { 0, 1, 2, 3 }}, + {"inputTensor2", { 4, 5, 6, 7 }}}, + {{"outputTensor", { 0, 1, 2, 3, 4, 5, 6, 7 }}}); } struct ConcatenationFixtureNCHW : ConcatenationFixture @@ -113,10 +114,11 @@ struct ConcatenationFixtureNCHW : ConcatenationFixture BOOST_FIXTURE_TEST_CASE(ParseConcatenationNCHW, ConcatenationFixtureNCHW) { - RunTest<4, uint8_t>(0, - {{"inputTensor1", { 0, 1, 2, 3 }}, - {"inputTensor2", { 4, 5, 6, 7 }}}, - {{"outputTensor", { 0, 1, 2, 3, 4, 5, 6, 7 }}}); + RunTest<4, armnn::DataType::QuantisedAsymm8>( + 0, + {{"inputTensor1", { 0, 1, 2, 3 }}, + {"inputTensor2", { 4, 5, 6, 7 }}}, + {{"outputTensor", { 0, 1, 2, 3, 4, 5, 6, 7 }}}); } struct ConcatenationFixtureNHWC : ConcatenationFixture @@ -126,10 +128,11 @@ struct ConcatenationFixtureNHWC : ConcatenationFixture BOOST_FIXTURE_TEST_CASE(ParseConcatenationNHWC, ConcatenationFixtureNHWC) { - RunTest<4, uint8_t>(0, - {{"inputTensor1", { 0, 1, 2, 3 }}, - {"inputTensor2", { 4, 5, 6, 7 }}}, - {{"outputTensor", { 0, 1, 4, 5, 2, 3, 6, 7 }}}); + RunTest<4, armnn::DataType::QuantisedAsymm8>( + 0, + {{"inputTensor1", { 0, 1, 2, 3 }}, + {"inputTensor2", { 4, 5, 6, 7 }}}, + {{"outputTensor", { 0, 1, 4, 5, 2, 3, 6, 7 }}}); } struct ConcatenationFixtureDim1 : ConcatenationFixture @@ -139,15 +142,16 @@ struct ConcatenationFixtureDim1 : ConcatenationFixture BOOST_FIXTURE_TEST_CASE(ParseConcatenationDim1, ConcatenationFixtureDim1) { - RunTest<4, uint8_t>(0, - { { "inputTensor1", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 } }, - { "inputTensor2", { 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73 } } }, - { { "outputTensor", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73 } } }); + RunTest<4, armnn::DataType::QuantisedAsymm8>( + 0, + { { "inputTensor1", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 } }, + { "inputTensor2", { 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73 } } }, + { { "outputTensor", { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73 } } }); } struct ConcatenationFixtureDim3 : ConcatenationFixture @@ -157,31 +161,32 @@ struct ConcatenationFixtureDim3 : ConcatenationFixture BOOST_FIXTURE_TEST_CASE(ParseConcatenationDim3, ConcatenationFixtureDim3) { - RunTest<4, uint8_t>(0, - { { "inputTensor1", { 0, 1, 2, 3, - 4, 5, 6, 7, - 8, 9, 10, 11, - 12, 13, 14, 15, - 16, 17, 18, 19, - 20, 21, 22, 23 } }, - { "inputTensor2", { 50, 51, 52, 53, - 54, 55, 56, 57, - 58, 59, 60, 61, - 62, 63, 64, 65, - 66, 67, 68, 69, - 70, 71, 72, 73 } } }, - { { "outputTensor", { 0, 1, 2, 3, - 50, 51, 52, 53, - 4, 5, 6, 7, - 54, 55, 56, 57, - 8, 9, 10, 11, - 58, 59, 60, 61, - 12, 13, 14, 15, - 62, 63, 64, 65, - 16, 17, 18, 19, - 66, 67, 68, 69, - 20, 21, 22, 23, - 70, 71, 72, 73 } } }); + RunTest<4, armnn::DataType::QuantisedAsymm8>( + 0, + { { "inputTensor1", { 0, 1, 2, 3, + 4, 5, 6, 7, + 8, 9, 10, 11, + 12, 13, 14, 15, + 16, 17, 18, 19, + 20, 21, 22, 23 } }, + { "inputTensor2", { 50, 51, 52, 53, + 54, 55, 56, 57, + 58, 59, 60, 61, + 62, 63, 64, 65, + 66, 67, 68, 69, + 70, 71, 72, 73 } } }, + { { "outputTensor", { 0, 1, 2, 3, + 50, 51, 52, 53, + 4, 5, 6, 7, + 54, 55, 56, 57, + 8, 9, 10, 11, + 58, 59, 60, 61, + 12, 13, 14, 15, + 62, 63, 64, 65, + 16, 17, 18, 19, + 66, 67, 68, 69, + 20, 21, 22, 23, + 70, 71, 72, 73 } } }); } BOOST_AUTO_TEST_SUITE_END() |