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
diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp
index b307490..8c52d23 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 @@
{
#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 7a36130..9d24000 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 @@
{
#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[],
diff --git a/test/1.3/QLstm.cpp b/test/1.3/QLstm.cpp
index f58ed0a..2dbd8b3 100644
--- a/test/1.3/QLstm.cpp
+++ b/test/1.3/QLstm.cpp
@@ -10,11 +10,12 @@
#include <armnn/utility/IgnoreUnused.hpp>
-#include <boost/array.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
#include <boost/math/special_functions/relative_difference.hpp>
+#include <array>
+
BOOST_AUTO_TEST_SUITE(QLSTMTests)
using ArmnnDriver = armnn_driver::ArmnnDriver;
@@ -85,9 +86,9 @@
}
#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::CpuAcc }};
+static const std::array<armnn::Compute, 2> COMPUTE_DEVICES = {{ armnn::Compute::CpuRef, armnn::Compute::CpuAcc }};
#endif
// Add our own tests here since we skip the qlstm tests which Google supplies (because of non-const weights)
diff --git a/test/Concat.cpp b/test/Concat.cpp
index b4b650f..0bc5424 100644
--- a/test/Concat.cpp
+++ b/test/Concat.cpp
@@ -7,12 +7,13 @@
#include "../1.0/HalPolicy.hpp"
-#include <boost/array.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
+#include <array>
#include <log/log.h>
+
BOOST_AUTO_TEST_SUITE(ConcatTests)
using namespace android::hardware;
@@ -25,9 +26,9 @@
{
#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
diff --git a/test/Lstm.hpp b/test/Lstm.hpp
index f9f1a76..21056c3 100644
--- a/test/Lstm.hpp
+++ b/test/Lstm.hpp
@@ -9,9 +9,10 @@
#include <armnn/utility/IgnoreUnused.hpp>
-#include <boost/array.hpp>
#include <boost/math/special_functions/relative_difference.hpp>
+#include <array>
+
using ArmnnDriver = armnn_driver::ArmnnDriver;
using DriverOptions = armnn_driver::DriverOptions;
@@ -95,9 +96,9 @@
} // anonymous 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
// Add our own tests here since we fail the lstm tests which Google supplies (because of non-const weights)