diff options
Diffstat (limited to 'src/backends/cl')
7 files changed, 14 insertions, 13 deletions
diff --git a/src/backends/cl/ClBackendContext.cpp b/src/backends/cl/ClBackendContext.cpp index 068e2958af..f612c3743d 100644 --- a/src/backends/cl/ClBackendContext.cpp +++ b/src/backends/cl/ClBackendContext.cpp @@ -7,6 +7,7 @@ #include "ClContextControl.hpp" #include <armnn/Logging.hpp> +#include <armnn/utility/Assert.hpp> #include <arm_compute/core/CL/OpenCL.h> #include <arm_compute/core/CL/CLKernelLibrary.h> @@ -184,7 +185,7 @@ ClBackendContext::ClBackendContext(const IRuntime::CreationOptions& options) return TuningLevel::Exhaustive; default: { - BOOST_ASSERT_MSG(false, "Tuning level not recognised."); + ARMNN_ASSERT_MSG(false, "Tuning level not recognised."); return TuningLevel::None; } } diff --git a/src/backends/cl/ClContextControl.cpp b/src/backends/cl/ClContextControl.cpp index f307133085..dbcccce945 100644 --- a/src/backends/cl/ClContextControl.cpp +++ b/src/backends/cl/ClContextControl.cpp @@ -9,12 +9,12 @@ #include <LeakChecking.hpp> +#include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <arm_compute/core/CL/CLKernelLibrary.h> #include <arm_compute/runtime/CL/CLScheduler.h> -#include <boost/assert.hpp> #include <boost/format.hpp> #include <boost/polymorphic_cast.hpp> @@ -59,11 +59,11 @@ ClContextControl::ClContextControl(arm_compute::CLTuner *tuner, // Removes the use of global CL context. cl::Context::setDefault(cl::Context{}); - BOOST_ASSERT(cl::Context::getDefault()() == NULL); + ARMNN_ASSERT(cl::Context::getDefault()() == NULL); // Removes the use of global CL command queue. cl::CommandQueue::setDefault(cl::CommandQueue{}); - BOOST_ASSERT(cl::CommandQueue::getDefault()() == NULL); + ARMNN_ASSERT(cl::CommandQueue::getDefault()() == NULL); // Always load the OpenCL runtime. LoadOpenClRuntime(); diff --git a/src/backends/cl/workloads/ClConstantWorkload.cpp b/src/backends/cl/workloads/ClConstantWorkload.cpp index 39ae14eaf3..e928870324 100644 --- a/src/backends/cl/workloads/ClConstantWorkload.cpp +++ b/src/backends/cl/workloads/ClConstantWorkload.cpp @@ -33,7 +33,7 @@ void ClConstantWorkload::Execute() const { const ConstantQueueDescriptor& data = this->m_Data; - BOOST_ASSERT(data.m_LayerOutput != nullptr); + ARMNN_ASSERT(data.m_LayerOutput != nullptr); arm_compute::CLTensor& output = static_cast<ClTensorHandle*>(data.m_Outputs[0])->GetTensor(); arm_compute::DataType computeDataType = static_cast<ClTensorHandle*>(data.m_Outputs[0])->GetDataType(); @@ -56,7 +56,7 @@ void ClConstantWorkload::Execute() const } default: { - BOOST_ASSERT_MSG(false, "Unknown data type"); + ARMNN_ASSERT_MSG(false, "Unknown data type"); break; } } diff --git a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp index e8af0ee3b7..73ec95ce9f 100644 --- a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp @@ -38,7 +38,7 @@ arm_compute::Status ClConvolution2dWorkloadValidate(const TensorInfo& input, if (descriptor.m_BiasEnabled) { - BOOST_ASSERT(biases.has_value()); + ARMNN_ASSERT(biases.has_value()); aclBiasesInfo = BuildArmComputeTensorInfo(biases.value(), descriptor.m_DataLayout); optionalAclBiasesInfo = &aclBiasesInfo; diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp index 858eab4e00..8704b1276f 100644 --- a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp +++ b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp @@ -45,7 +45,7 @@ arm_compute::Status ClDepthwiseConvolutionWorkloadValidate(const TensorInfo& inp if (descriptor.m_BiasEnabled) { - BOOST_ASSERT(biases.has_value()); + ARMNN_ASSERT(biases.has_value()); aclBiasesInfo = BuildArmComputeTensorInfo(biases.value(), descriptor.m_DataLayout); optionalAclBiasesInfo = &aclBiasesInfo; @@ -125,7 +125,7 @@ ClDepthwiseConvolutionWorkload::ClDepthwiseConvolutionWorkload( arm_compute::ActivationLayerInfo(), aclDilationInfo); - BOOST_ASSERT(m_DepthwiseConvolutionLayer); + ARMNN_ASSERT(m_DepthwiseConvolutionLayer); ScopedCpuTensorHandle weightsPermutedHandle(weightPermuted); InitializeArmComputeClTensorData(*m_KernelTensor, &weightsPermutedHandle); @@ -148,7 +148,7 @@ void ClDepthwiseConvolutionWorkload::FreeUnusedTensors() void ClDepthwiseConvolutionWorkload::Execute() const { ARMNN_SCOPED_PROFILING_EVENT_CL("ClDepthwiseConvolutionWorkload_Execute"); - BOOST_ASSERT(m_DepthwiseConvolutionLayer); + ARMNN_ASSERT(m_DepthwiseConvolutionLayer); RunClFunction(*m_DepthwiseConvolutionLayer, CHECK_LOCATION()); } diff --git a/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp index 7c0736645b..20b2104c62 100644 --- a/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClTransposeConvolution2dWorkload.cpp @@ -38,7 +38,7 @@ arm_compute::Status ClTransposeConvolution2dWorkloadValidate(const TensorInfo& i if (descriptor.m_BiasEnabled) { - BOOST_ASSERT(biases.has_value()); + ARMNN_ASSERT(biases.has_value()); aclBiasesInfo = BuildArmComputeTensorInfo(biases.value(), descriptor.m_DataLayout); optionalAclBiasesInfo = &aclBiasesInfo; diff --git a/src/backends/cl/workloads/ClWorkloadUtils.hpp b/src/backends/cl/workloads/ClWorkloadUtils.hpp index b4bcc1c017..54e7717b7d 100644 --- a/src/backends/cl/workloads/ClWorkloadUtils.hpp +++ b/src/backends/cl/workloads/ClWorkloadUtils.hpp @@ -90,7 +90,7 @@ inline auto SetClSliceData(const std::vector<unsigned int>& m_begin, inline void InitializeArmComputeClTensorData(arm_compute::CLTensor& clTensor, const ConstCpuTensorHandle* handle) { - BOOST_ASSERT(handle); + ARMNN_ASSERT(handle); armcomputetensorutils::InitialiseArmComputeTensorEmpty(clTensor); switch(handle->GetTensorInfo().GetDataType()) @@ -116,7 +116,7 @@ inline void InitializeArmComputeClTensorData(arm_compute::CLTensor& clTensor, CopyArmComputeClTensorData(clTensor, handle->GetConstTensor<int32_t>()); break; default: - BOOST_ASSERT_MSG(false, "Unexpected tensor type."); + ARMNN_ASSERT_MSG(false, "Unexpected tensor type."); } }; |