diff options
| author | David Beck <david.beck@arm.com> | 2018-10-04 15:43:17 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-10 16:16:58 +0100 |
| commit | 5eec11db435a94ba5046ba74edc5c9c412a64e9d (patch) | |
| tree | 6a3d9b9126ae449fc5e83838b2eb1765a67d6aad /src/backends/cl/workloads | |
| parent | d806792f7fbdae2cfa8dcb1eb59b9400b84741da (diff) | |
| download | armnn-5eec11db435a94ba5046ba74edc5c9c412a64e9d.tar.gz | |
IVGCVSW-1964 : replace optional biases with home-grown Optional
!android-nn-driver:151788
Change-Id: Ibdc41d09b8df05e7a0360dcb8a060860dfb1bd99
Diffstat (limited to 'src/backends/cl/workloads')
4 files changed, 8 insertions, 11 deletions
diff --git a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp index 521711becc..301859ee1b 100644 --- a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp @@ -24,7 +24,7 @@ arm_compute::Status ClConvolution2dWorkloadValidate(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); @@ -35,9 +35,9 @@ arm_compute::Status ClConvolution2dWorkloadValidate(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/cl/workloads/ClConvolution2dWorkload.hpp b/src/backends/cl/workloads/ClConvolution2dWorkload.hpp index 14a39f3b25..a5de87639b 100644 --- a/src/backends/cl/workloads/ClConvolution2dWorkload.hpp +++ b/src/backends/cl/workloads/ClConvolution2dWorkload.hpp @@ -13,8 +13,6 @@ #include <arm_compute/runtime/CL/functions/CLConvolutionLayer.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> -#include <boost/optional.hpp> - #include <memory> namespace armnn @@ -24,7 +22,7 @@ arm_compute::Status ClConvolution2dWorkloadValidate(const TensorInfo& input, const TensorInfo& output, const Convolution2dDescriptor& descriptor, const TensorInfo& weights, - const boost::optional<TensorInfo>& biases); + const Optional<TensorInfo>& biases); class ClConvolution2dWorkload : public BaseWorkload<Convolution2dQueueDescriptor> { diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp index 5a036db922..53ac3bae99 100644 --- a/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp +++ b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.cpp @@ -21,7 +21,7 @@ arm_compute::Status ClDepthwiseConvolutionWorkloadValidate(const TensorInfo& inp 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 @@ arm_compute::Status ClDepthwiseConvolutionWorkloadValidate(const TensorInfo& inp 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/cl/workloads/ClDepthwiseConvolutionBaseWorkload.hpp b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.hpp index 9d5cde30b6..27aec8ecdd 100644 --- a/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.hpp +++ b/src/backends/cl/workloads/ClDepthwiseConvolutionBaseWorkload.hpp @@ -6,7 +6,6 @@ #pragma once #include <backends/Workload.hpp> -#include <boost/optional.hpp> #include <arm_compute/runtime/CL/CLFunctions.h> @@ -17,7 +16,7 @@ arm_compute::Status ClDepthwiseConvolutionWorkloadValidate(const TensorInfo& inp const TensorInfo& output, const DepthwiseConvolution2dDescriptor& descriptor, const TensorInfo& weights, - const boost::optional<TensorInfo>& biases); + const Optional<TensorInfo>& biases); template<armnn::DataType... dataTypes> class ClDepthwiseConvolutionBaseWorkload : public TypedWorkload<DepthwiseConvolution2dQueueDescriptor, dataTypes...> |