diff options
author | Colm Donelan <Colm.Donelan@arm.com> | 2020-10-30 16:57:43 +0000 |
---|---|---|
committer | Colm Donelan <colm.donelan@arm.com> | 2020-10-30 20:51:21 +0000 |
commit | d7fdbe2306b9ebaba0aa625d8be14114f8631054 (patch) | |
tree | be8c5c41efe28fde556e5652e93694fe409f0c2c /test/1.1 | |
parent | 2408c595999a2632c95fcbe84462b1ac8fc2fcd4 (diff) | |
download | android-nn-driver-d7fdbe2306b9ebaba0aa625d8be14114f8631054.tar.gz |
IVGCVSW-5267 Remove use of boost::array from unit tests.
* Boost::array is used in a small number of nn driver unittests. It
can be directly replaced by std::array in C++ 11.
Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: I4c6f4489b7cab8e60c6b76172c3027f953d63e3c
Diffstat (limited to 'test/1.1')
-rw-r--r-- | test/1.1/Mean.cpp | 7 | ||||
-rw-r--r-- | test/1.1/Transpose.cpp | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp index b3074909..8c52d23d 100644 --- a/test/1.1/Mean.cpp +++ b/test/1.1/Mean.cpp @@ -8,9 +8,10 @@ #include "../1.1/HalPolicy.hpp" -#include <boost/array.hpp> #include <boost/test/data/test_case.hpp> +#include <array> + BOOST_AUTO_TEST_SUITE(MeanTests) using namespace android::hardware; @@ -23,9 +24,9 @@ namespace { #ifndef ARMCOMPUTECL_ENABLED - static const boost::array<armnn::Compute, 1> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef }}; + static const std::array<armnn::Compute, 1> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef }}; #else - static const boost::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }}; + static const std::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }}; #endif void MeanTestImpl(const TestTensor& input, diff --git a/test/1.1/Transpose.cpp b/test/1.1/Transpose.cpp index 7a36130a..9d240004 100644 --- a/test/1.1/Transpose.cpp +++ b/test/1.1/Transpose.cpp @@ -9,12 +9,12 @@ #include "../1.1/HalPolicy.hpp" -#include <boost/array.hpp> #include <boost/test/unit_test.hpp> #include <boost/test/data/test_case.hpp> #include <log/log.h> +#include <array> #include <cmath> BOOST_AUTO_TEST_SUITE(TransposeTests) @@ -29,9 +29,9 @@ namespace { #ifndef ARMCOMPUTECL_ENABLED - static const boost::array<armnn::Compute, 1> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef }}; + static const std::array<armnn::Compute, 1> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef }}; #else - static const boost::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }}; + static const std::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::GpuAcc }}; #endif void TransposeTestImpl(const TestTensor & inputs, int32_t perm[], |