diff options
| author | Matthew Bentham <Matthew.Bentham@arm.com> | 2018-09-21 15:16:53 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-10 16:16:56 +0100 |
| commit | ca6616cb6335de2135864f9795f02023a12cda3b (patch) | |
| tree | adfb15f11ca5b2935392f35957ff9837e6b9bf1d | |
| parent | 785df505a621a5b98084246056d80090073b950b (diff) | |
| download | armnn-ca6616cb6335de2135864f9795f02023a12cda3b.tar.gz | |
IVGCVSW-949 Further simplify InitializeArmComputeClTensorData
Remove the overload that takes a raw pointer and always pass a ConstTensor reference
Change-Id: I8fbff8dd5c260e7cdf4a3c51eb54cc5f3f6e874c
| -rw-r--r-- | src/backends/ClWorkloads/ClBaseConstantWorkload.cpp | 6 | ||||
| -rw-r--r-- | src/backends/ClWorkloads/ClWorkloadUtils.hpp | 19 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp b/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp index 021d17512f..97ddfd6352 100644 --- a/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp +++ b/src/backends/ClWorkloads/ClBaseConstantWorkload.cpp @@ -36,17 +36,17 @@ void ClBaseConstantWorkload<dataTypes...>::Execute() const { case arm_compute::DataType::F16: { - CopyArmComputeClTensorData(data.m_LayerOutput->GetConstTensor<Half>(), output); + CopyArmComputeClTensorData(output, data.m_LayerOutput->GetConstTensor<Half>()); break; } case arm_compute::DataType::F32: { - CopyArmComputeClTensorData(data.m_LayerOutput->GetConstTensor<float>(), output); + CopyArmComputeClTensorData(output, data.m_LayerOutput->GetConstTensor<float>()); break; } case arm_compute::DataType::QASYMM8: { - CopyArmComputeClTensorData(data.m_LayerOutput->GetConstTensor<uint8_t>(), output); + CopyArmComputeClTensorData(output, data.m_LayerOutput->GetConstTensor<uint8_t>()); break; } default: diff --git a/src/backends/ClWorkloads/ClWorkloadUtils.hpp b/src/backends/ClWorkloads/ClWorkloadUtils.hpp index a10237cf40..9c415b2267 100644 --- a/src/backends/ClWorkloads/ClWorkloadUtils.hpp +++ b/src/backends/ClWorkloads/ClWorkloadUtils.hpp @@ -20,7 +20,7 @@ namespace armnn { template <typename T> -void CopyArmComputeClTensorData(const T* srcData, arm_compute::CLTensor& dstTensor) +void CopyArmComputeClTensorData(arm_compute::CLTensor& dstTensor, const T* srcData) { { ARMNN_SCOPED_PROFILING_EVENT_CL("MapClTensorForWriting"); @@ -35,30 +35,25 @@ void CopyArmComputeClTensorData(const T* srcData, arm_compute::CLTensor& dstTens dstTensor.unmap(); } -template <typename T> -void InitialiseArmComputeClTensorData(arm_compute::CLTensor& clTensor, const T* data) -{ - armcomputetensorutils::InitialiseArmComputeTensorEmpty(clTensor); - CopyArmComputeClTensorData<T>(data, clTensor); -} - inline void InitializeArmComputeClTensorData(arm_compute::CLTensor& clTensor, const ConstCpuTensorHandle* handle) { BOOST_ASSERT(handle); + + armcomputetensorutils::InitialiseArmComputeTensorEmpty(clTensor); switch(handle->GetTensorInfo().GetDataType()) { case DataType::Float16: - InitialiseArmComputeClTensorData(clTensor, handle->GetConstTensor<armnn::Half>()); + CopyArmComputeClTensorData(clTensor, handle->GetConstTensor<armnn::Half>()); break; case DataType::Float32: - InitialiseArmComputeClTensorData(clTensor, handle->GetConstTensor<float>()); + CopyArmComputeClTensorData(clTensor, handle->GetConstTensor<float>()); break; case DataType::QuantisedAsymm8: - InitialiseArmComputeClTensorData(clTensor, handle->GetConstTensor<uint8_t>()); + CopyArmComputeClTensorData(clTensor, handle->GetConstTensor<uint8_t>()); break; case DataType::Signed32: - InitialiseArmComputeClTensorData(clTensor, handle->GetConstTensor<int32_t>()); + CopyArmComputeClTensorData(clTensor, handle->GetConstTensor<int32_t>()); break; default: BOOST_ASSERT_MSG(false, "Unexpected tensor type."); |