commit 5eec11db435a94ba5046ba74edc5c9c412a64e9d
author David Beck <david.beck@arm.com> Thu Oct 04 15:43:17 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Wed Oct 10 16:16:58 2018 +0100
tree 6a3d9b9126ae449fc5e83838b2eb1765a67d6aad
parent d806792f7fbdae2cfa8dcb1eb59b9400b84741da

IVGCVSW-1964 : replace optional biases with home-grown Optional

!android-nn-driver:151788

Change-Id: Ibdc41d09b8df05e7a0360dcb8a060860dfb1bd99

src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp

diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp
index 5a036db..53ac3ba 100644
--- a/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp
@@ -21,7 +21,7 @@
     const TensorInfo& output,
     const DepthwiseConvolution2dDescriptor& 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 @@
 
     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;
     }