diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2019-12-11 16:59:01 +0000 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2019-12-11 16:59:01 +0000 |
| commit | 356bfec771858ed435874b525fd88da505380103 (patch) | |
| tree | 328d85fbe343c9ad92e2cef9921520b58a5bffc1 /src/backends/cl/workloads/ClStridedSliceWorkload.cpp | |
| parent | 26052fcf2f8c91f3479c9484354e88e8944d004d (diff) | |
| download | armnn-356bfec771858ed435874b525fd88da505380103.tar.gz | |
IVGCVSW-4254 Patch Strided Slice CTS failures
Change-Id: Idc7e95f20b1fceb2135db4960877671c155b2f4b
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/backends/cl/workloads/ClStridedSliceWorkload.cpp')
| -rw-r--r-- | src/backends/cl/workloads/ClStridedSliceWorkload.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/backends/cl/workloads/ClStridedSliceWorkload.cpp b/src/backends/cl/workloads/ClStridedSliceWorkload.cpp index e51fa34233..6b0a34d90e 100644 --- a/src/backends/cl/workloads/ClStridedSliceWorkload.cpp +++ b/src/backends/cl/workloads/ClStridedSliceWorkload.cpp @@ -11,7 +11,9 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <backendsCommon/CpuTensorHandle.hpp> +#include <backendsCommon/WorkloadUtils.hpp> +#include <boost/numeric/conversion/cast.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> #include <cl/ClLayerSupport.hpp> @@ -34,9 +36,10 @@ arm_compute::Status ClStridedSliceWorkloadValidate(const TensorInfo& input, std::tie(starts, ends, strides) = SetClStridedSliceData(descriptor.m_Begin, descriptor.m_End, descriptor.m_Stride); - int32_t begin_mask = descriptor.m_BeginMask; - int32_t end_mask = descriptor.m_EndMask; - int32_t shrink_axis_mask = descriptor.m_ShrinkAxisMask; + auto numDimensions = boost::numeric_cast<int>(input.GetNumDimensions()); + int32_t begin_mask = ConvertMaskToACLFormat(descriptor.m_BeginMask, numDimensions); + int32_t end_mask = ConvertMaskToACLFormat(descriptor.m_EndMask, numDimensions); + int32_t shrink_axis_mask = ConvertMaskToACLFormat(descriptor.m_ShrinkAxisMask, numDimensions); return arm_compute::CLStridedSlice::validate(&aclInputInfo, &aclOutputInfo, @@ -65,9 +68,10 @@ ClStridedSliceWorkload::ClStridedSliceWorkload(const StridedSliceQueueDescriptor m_Data.m_Parameters.m_End, m_Data.m_Parameters.m_Stride); - int32_t begin_mask = m_Data.m_Parameters.m_BeginMask; - int32_t end_mask = m_Data.m_Parameters.m_EndMask; - int32_t shrink_axis_mask = m_Data.m_Parameters.m_ShrinkAxisMask; + auto numDimensions = boost::numeric_cast<int>(info.m_InputTensorInfos[0].GetNumDimensions()); + int32_t begin_mask = ConvertMaskToACLFormat(m_Data.m_Parameters.m_BeginMask, numDimensions); + int32_t end_mask = ConvertMaskToACLFormat(m_Data.m_Parameters.m_EndMask, numDimensions); + int32_t shrink_axis_mask = ConvertMaskToACLFormat(m_Data.m_Parameters.m_ShrinkAxisMask, numDimensions); arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); input.info()->set_data_layout(aclDataLayout); |