From 5eec11db435a94ba5046ba74edc5c9c412a64e9d Mon Sep 17 00:00:00 2001
From: David Beck <david.beck@arm.com>
Date: Thu, 4 Oct 2018 15:43:17 +0100
Subject: IVGCVSW-1964 : replace optional biases with home-grown Optional

!android-nn-driver:151788

Change-Id: Ibdc41d09b8df05e7a0360dcb8a060860dfb1bd99
---
 src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp       | 6 +++---
 src/backends/neon/workloads/NeonConvolution2dBaseWorkload.hpp       | 4 +---
 .../neon/workloads/NeonDepthwiseConvolutionBaseWorkload.cpp         | 6 +++---
 .../neon/workloads/NeonDepthwiseConvolutionBaseWorkload.hpp         | 4 +---
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/backends/neon/workloads')

diff --git a/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp b/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp
index 02edabfd9c..8da3e47249 100644
--- a/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp
+++ b/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp
@@ -21,7 +21,7 @@ arm_compute::Status NeonConvolution2dWorkloadValidate(const TensorInfo& input,
     const TensorInfo& output,
     const Convolution2dDescriptor& descriptor,
     const TensorInfo& weights,
-    const boost::optional<TensorInfo>& biases)
+    const Optional<TensorInfo>& biases)
 {
     const arm_compute::TensorInfo aclInputInfo = BuildArmComputeTensorInfo(input, descriptor.m_DataLayout);
     const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout);
@@ -32,9 +32,9 @@ arm_compute::Status NeonConvolution2dWorkloadValidate(const TensorInfo& input,
 
     if (descriptor.m_BiasEnabled)
     {
-        BOOST_ASSERT(biases.is_initialized());
+        BOOST_ASSERT(biases.has_value());
 
-        aclBiasesInfo = BuildArmComputeTensorInfo(biases.get(), descriptor.m_DataLayout);
+        aclBiasesInfo = BuildArmComputeTensorInfo(biases.value(), descriptor.m_DataLayout);
         optionalAclBiasesInfo = &aclBiasesInfo;
     }
 
diff --git a/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.hpp b/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.hpp
index 6af89c1f01..1cd30c70f9 100644
--- a/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.hpp
+++ b/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.hpp
@@ -13,8 +13,6 @@
 
 #include <arm_compute/runtime/MemoryManagerOnDemand.h>
 
-#include <boost/optional.hpp>
-
 #include <memory>
 
 namespace armnn
@@ -24,7 +22,7 @@ arm_compute::Status NeonConvolution2dWorkloadValidate(const TensorInfo& input,
     const TensorInfo& output,
     const Convolution2dDescriptor& descriptor,
     const TensorInfo& weights,
-    const boost::optional<TensorInfo>& biases);
+    const Optional<TensorInfo>& biases);
 
 template<armnn::DataType... dataTypes>
 class NeonConvolution2dBaseWorkload : public TypedWorkload<Convolution2dQueueDescriptor, dataTypes...>
diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionBaseWorkload.cpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionBaseWorkload.cpp
index ef60b3238d..aa535adec9 100644
--- a/src/backends/neon/workloads/NeonDepthwiseConvolutionBaseWorkload.cpp
+++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionBaseWorkload.cpp
@@ -14,7 +14,7 @@ arm_compute::Status NeonDepthwiseConvolutionWorkloadValidate(const TensorInfo& i
     const TensorInfo& output,
     const DepthwiseConvolution2dDescriptor& descriptor,
     const TensorInfo& weights,
-    const boost::optional<TensorInfo>& biases)
+    const Optional<TensorInfo>& biases)
 {
     const arm_compute::TensorInfo aclInputInfo =
         armcomputetensorutils::BuildArmComputeTensorInfo(input, descriptor.m_DataLayout);
@@ -28,9 +28,9 @@ arm_compute::Status NeonDepthwiseConvolutionWorkloadValidate(const TensorInfo& i
 
     if (descriptor.m_BiasEnabled)
     {
-        BOOST_ASSERT(biases.is_initialized());
+        BOOST_ASSERT(biases.has_value());
 
-        aclBiasesInfo = armcomputetensorutils::BuildArmComputeTensorInfo(biases.get(), descriptor.m_DataLayout);
+        aclBiasesInfo = armcomputetensorutils::BuildArmComputeTensorInfo(biases.value(), descriptor.m_DataLayout);
         optionalAclBiasesInfo = &aclBiasesInfo;
     }
 
diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionBaseWorkload.hpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionBaseWorkload.hpp
index 982992a363..ffee50861a 100644
--- a/src/backends/neon/workloads/NeonDepthwiseConvolutionBaseWorkload.hpp
+++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionBaseWorkload.hpp
@@ -7,8 +7,6 @@
 
 #include <backends/neon/workloads/NeonWorkloadUtils.hpp>
 
-#include <boost/optional.hpp>
-
 namespace armnn
 {
 
@@ -16,6 +14,6 @@ arm_compute::Status NeonDepthwiseConvolutionWorkloadValidate(const TensorInfo& i
                                                              const TensorInfo& output,
                                                              const DepthwiseConvolution2dDescriptor& descriptor,
                                                              const TensorInfo& weights,
-                                                             const boost::optional<TensorInfo>& biases);
+                                                             const Optional<TensorInfo>& biases);
 
 } // namespace armnn
-- 
cgit v1.2.1