diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-06-14 12:35:24 +0100 |
|---|---|---|
| committer | mike.kelly <mike.kelly@arm.com> | 2019-06-14 14:27:23 +0000 |
| commit | db48288f54ad441f34108cf270ed3089d3a465ea (patch) | |
| tree | 08372fd4ef909dc161212f09c90a010adaf398a4 /src/backends/neon/test/NeonCreateWorkloadTests.cpp | |
| parent | 24d7321ad7897e8836d4a38039a73a0ec419cf43 (diff) | |
| download | armnn-db48288f54ad441f34108cf270ed3089d3a465ea.tar.gz | |
MLCE-121 Github: Build error on GCC 9
* Fixed an error encountered when building on GCC 9
error: moving a local object in a return statement prevents copy elision
* Fixed failures in unit tests due to std::initializer_list handling in GCC 9
Change-Id: I4bfdd2113dfedcecd29479ee556e4ae22278755d
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Diffstat (limited to 'src/backends/neon/test/NeonCreateWorkloadTests.cpp')
| -rw-r--r-- | src/backends/neon/test/NeonCreateWorkloadTests.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index 83823659b0..523588c50a 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -275,12 +275,10 @@ static void NeonCreateDepthWiseConvolutionWorkloadTest(DataLayout dataLayout) auto inputHandle = boost::polymorphic_downcast<INeonTensorHandle*>(queueDescriptor.m_Inputs[0]); auto outputHandle = boost::polymorphic_downcast<INeonTensorHandle*>(queueDescriptor.m_Outputs[0]); - std::initializer_list<unsigned int> inputShape = (dataLayout == DataLayout::NCHW) - ? std::initializer_list<unsigned int>({ 2, 2, 5, 5 }) - : std::initializer_list<unsigned int>({ 2, 5, 5, 2 }); - std::initializer_list<unsigned int> outputShape = (dataLayout == DataLayout::NCHW) - ? std::initializer_list<unsigned int>({ 2, 2, 5, 5 }) - : std::initializer_list<unsigned int>({ 2, 5, 5, 2 }); + TensorShape inputShape = (dataLayout == DataLayout::NCHW) ? std::initializer_list<unsigned int>({ 2, 2, 5, 5 }) + : std::initializer_list<unsigned int>({ 2, 5, 5, 2 }); + TensorShape outputShape = (dataLayout == DataLayout::NCHW) ? std::initializer_list<unsigned int>({ 2, 2, 5, 5 }) + : std::initializer_list<unsigned int>({ 2, 5, 5, 2 }); BOOST_TEST(TestNeonTensorHandleInfo(inputHandle, TensorInfo(inputShape, DataType))); BOOST_TEST(TestNeonTensorHandleInfo(outputHandle, TensorInfo(outputShape, DataType))); |