From d7fdbe2306b9ebaba0aa625d8be14114f8631054 Mon Sep 17 00:00:00 2001
From: Colm Donelan <Colm.Donelan@arm.com>
Date: Fri, 30 Oct 2020 16:57:43 +0000
Subject: 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
---
 test/1.1/Mean.cpp      | 7 ++++---
 test/1.1/Transpose.cpp | 6 +++---
 test/1.3/QLstm.cpp     | 7 ++++---
 test/Concat.cpp        | 7 ++++---
 test/Lstm.hpp          | 7 ++++---
 5 files changed, 19 insertions(+), 15 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[],
diff --git a/test/1.3/QLstm.cpp b/test/1.3/QLstm.cpp
index f58ed0a9..2dbd8b3e 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 @@ void ExecuteModel(const armnn_driver::hal_1_3::HalPolicy::Model& model,
 }
 
 #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 b4b650fa..0bc54247 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 @@ 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
diff --git a/test/Lstm.hpp b/test/Lstm.hpp
index f9f1a761..21056c3d 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 @@ void ExecuteModel<armnn_driver::hal_1_2::HalPolicy::Model>(const armnn_driver::h
 } // 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)
-- 
cgit v1.2.1