diff options
| author | Matthew Bentham <matthew.bentham@arm.com> | 2018-11-20 14:33:33 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-11-20 15:38:24 +0000 |
| commit | 8910528b126fed87628c23f7e51f7e018b13989a (patch) | |
| tree | 67d7a3b0cfe8d0878f545d45b48c45c1e62320b2 /src/backends/aclCommon | |
| parent | 07fefa5d487bbd47c7755a7bb88b05edbe1d8342 (diff) | |
| download | armnn-8910528b126fed87628c23f7e51f7e018b13989a.tar.gz | |
IVGCVSW-1199 Disable auto-flattening of Compute Library tensors
This is one of the reasons why the tests in https://review.mlplatform.org/#/c/ml/armnn/+/237/
are failing (but not the only reason).
Change-Id: If485bade2a6dd013cba826cec71d748fc7747249
Diffstat (limited to 'src/backends/aclCommon')
| -rw-r--r-- | src/backends/aclCommon/ArmComputeTensorUtils.cpp | 2 | ||||
| -rw-r--r-- | src/backends/aclCommon/test/CreateWorkloadClNeon.hpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/backends/aclCommon/ArmComputeTensorUtils.cpp b/src/backends/aclCommon/ArmComputeTensorUtils.cpp index 9fb78f8a80..ba7cd14f3f 100644 --- a/src/backends/aclCommon/ArmComputeTensorUtils.cpp +++ b/src/backends/aclCommon/ArmComputeTensorUtils.cpp @@ -40,7 +40,7 @@ arm_compute::TensorShape BuildArmComputeTensorShape(const armnn::TensorShape& te for (unsigned int i = 0; i < tensorShape.GetNumDimensions(); i++) { // Note that our dimensions are stored in the opposite order to ACL's. - shape.set(tensorShape.GetNumDimensions() - i - 1, tensorShape[i]); + shape.set(tensorShape.GetNumDimensions() - i - 1, tensorShape[i], false); // TensorShape::set() flattens leading ones, so that batch size 1 cannot happen. // arm_compute tensors expect this. diff --git a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp index ec2072d243..adabed07f8 100644 --- a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp +++ b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp @@ -47,7 +47,9 @@ boost::test_tools::predicate_result CompareTensorHandleShape(IComputeTensorHandl if (info->dimension(i) != expectedDimension) { boost::test_tools::predicate_result res(false); - res.message() << "Different dimension [" << info->dimension(i) << "!=" << expectedDimension << "]"; + res.message() << "For dimension " << i << + " expected size " << expectedDimension << + " got " << info->dimension(i); return res; } @@ -104,4 +106,4 @@ void CreateMemCopyWorkloads(IWorkloadFactory& factory) BOOST_TEST((outputHandle2->GetTensorInfo() == TensorInfo({2, 3}, DataType::Float32))); } -} //namespace
\ No newline at end of file +} //namespace |