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/backends/cl/test | |
parent | 382e21ce95c04479a6900afca81a57949b369f1e (diff) | |
download | armnn-649dd9515ddf4bd00a0bff64d51dfd835a6c7b39.tar.gz |
IVGCVSW-2467 Remove GetDataType<T> function
Change-Id: I7359617a307b9abb4c30b3d5f2364dc6d0f828f0
Diffstat (limited to 'src/backends/cl/test')
-rw-r--r-- | src/backends/cl/test/ClEndToEndTests.cpp | 12 | ||||
-rwxr-xr-x | src/backends/cl/test/ClLayerTests.cpp | 8 | ||||
-rw-r--r-- | src/backends/cl/test/OpenClTimerTest.cpp | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp index bf299dc0b5..ba94353049 100644 --- a/src/backends/cl/test/ClEndToEndTests.cpp +++ b/src/backends/cl/test/ClEndToEndTests.cpp @@ -19,32 +19,32 @@ BOOST_AUTO_TEST_CASE(ConstantUsage_Cl_Float32) BOOST_AUTO_TEST_CASE(ClMergerEndToEndDim0Test) { - MergerDim0EndToEnd<float>(defaultBackends); + MergerDim0EndToEnd<armnn::DataType::Float32>(defaultBackends); } BOOST_AUTO_TEST_CASE(ClMergerEndToEndDim0Uint8Test) { - MergerDim0EndToEnd<uint8_t>(defaultBackends); + MergerDim0EndToEnd<armnn::DataType::QuantisedAsymm8>(defaultBackends); } BOOST_AUTO_TEST_CASE(ClMergerEndToEndDim1Test) { - MergerDim1EndToEnd<float>(defaultBackends); + MergerDim1EndToEnd<armnn::DataType::Float32>(defaultBackends); } BOOST_AUTO_TEST_CASE(ClMergerEndToEndDim1Uint8Test) { - MergerDim1EndToEnd<uint8_t>(defaultBackends); + MergerDim1EndToEnd<armnn::DataType::QuantisedAsymm8>(defaultBackends); } BOOST_AUTO_TEST_CASE(ClMergerEndToEndDim3Test) { - MergerDim3EndToEnd<float>(defaultBackends); + MergerDim3EndToEnd<armnn::DataType::Float32>(defaultBackends); } BOOST_AUTO_TEST_CASE(ClMergerEndToEndDim3Uint8Test) { - MergerDim3EndToEnd<uint8_t>(defaultBackends); + MergerDim3EndToEnd<armnn::DataType::QuantisedAsymm8>(defaultBackends); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 96f2f1fe77..2fe03abb3c 100755 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -414,17 +414,17 @@ ARMNN_AUTO_TEST_CASE(StridedSlice2DReverseUint8, StridedSlice2DReverseUint8Test) ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareConv2dWithReference, CompareConvolution2dTest) ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceFloat32, - CompareDepthwiseConvolution2dTest<float>, + CompareDepthwiseConvolution2dFloatTest, armnn::DataLayout::NCHW) ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceUint8, - CompareDepthwiseConvolution2dTest<uint8_t>, + CompareDepthwiseConvolution2dUint8Test, armnn::DataLayout::NCHW) ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceFloat32Nhwc, - CompareDepthwiseConvolution2dTest<float>, + CompareDepthwiseConvolution2dFloatTest, armnn::DataLayout::NHWC) ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareDepthwiseConv2dWithReferenceUint8Nhwc, - CompareDepthwiseConvolution2dTest<uint8_t>, + CompareDepthwiseConvolution2dUint8Test, armnn::DataLayout::NHWC) ARMNN_COMPARE_REF_AUTO_TEST_CASE(CompareNormalizationWithinWithReference, CompareNormalizationTest, diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp index 6f44cc4772..1eeb9ed98f 100644 --- a/src/backends/cl/test/OpenClTimerTest.cpp +++ b/src/backends/cl/test/OpenClTimerTest.cpp @@ -54,9 +54,9 @@ BOOST_AUTO_TEST_CASE(OpenClTimerBatchNorm) int32_t qOffset = 0; float qScale = 0.f; - TensorInfo inputTensorInfo({num, channels, height, width}, GetDataType<float>()); - TensorInfo outputTensorInfo({num, channels, height, width}, GetDataType<float>()); - TensorInfo tensorInfo({channels}, GetDataType<float>()); + TensorInfo inputTensorInfo({num, channels, height, width}, DataType::Float32); + TensorInfo outputTensorInfo({num, channels, height, width}, DataType::Float32); + TensorInfo tensorInfo({channels}, DataType::Float32); // Set quantization parameters if the requested type is a quantized type. if(IsQuantizedType<float>()) @@ -143,4 +143,4 @@ BOOST_AUTO_TEST_CASE(OpenClTimerBatchNorm) BOOST_AUTO_TEST_SUITE_END() -#endif //aarch64 or x86_64
\ No newline at end of file +#endif //aarch64 or x86_64 |