aboutsummaryrefslogtreecommitdiff
path: root/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp
diff options
context:
space:
mode:
authorMike Kelly <mike.kelly@arm.com>2023-12-04 17:23:09 +0000
committerNikhil Raj Arm <nikhil.raj@arm.com>2023-12-05 16:58:10 +0000
commita9c3267d1a20e69a9cc0ae98b52958a6277e2f0d (patch)
treecf8ba49f42bcdb6d8360ca705b247bdd656925f8 /src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp
parenta8337d7a1e9f5aa3ed380dd0f5a4cf7636360122 (diff)
downloadarmnn-a9c3267d1a20e69a9cc0ae98b52958a6277e2f0d.tar.gz
IVGCVSW-8159 Fixed issues building with NDK r26
* The compiler shipped with NDK r26 has stricter rules around certain warnings and deprecation notices. * Fixed warnings for unqualified call to 'std::move' * Fixed error where the half values weren't being cast to a float when calling 'std::nan' * Removed unnecessary subtensor unit tests for neon Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: I4ceb46e55ff5f2a754452e3a43de2188d58bf927
Diffstat (limited to 'src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp')
-rw-r--r--src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp
index b750a7a918..da4c6a62be 100644
--- a/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/SplitterEndToEndTestImpl.hpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2019-2021,2023 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
#pragma once
@@ -97,7 +97,7 @@ void Splitter1dEndToEnd(const std::vector<BackendId>& backends)
std::map<int, std::vector<T>> inputTensorData = { { 0, inputData } };
std::map<int, std::vector<T>> expectedOutputData = { { 0, expectedOutput0 }, {1, expectedOutput1} };
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType>
@@ -132,7 +132,7 @@ void Splitter2dDim0EndToEnd(const std::vector<BackendId>& backends)
std::map<int, std::vector<T>> inputTensorData = { { 0, inputData } };
std::map<int, std::vector<T>> expectedOutputData = { { 0, expectedOutput0 }, {1, expectedOutput1} };
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType>
@@ -170,7 +170,7 @@ void Splitter2dDim1EndToEnd(const std::vector<BackendId>& backends)
{ 1, expectedOutput1 },
{ 2, expectedOutput2 } };
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType>
@@ -218,7 +218,7 @@ void Splitter3dDim0EndToEnd(const std::vector<BackendId>& backends)
std::map<int, std::vector<T>> expectedOutputData = { { 0, expectedOutput0 },
{ 1, expectedOutput1 } };
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType>
@@ -266,7 +266,7 @@ void Splitter3dDim1EndToEnd(const std::vector<BackendId>& backends)
std::map<int, std::vector<T>> expectedOutputData = { { 0, expectedOutput0 },
{ 1, expectedOutput1 } };
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType>
@@ -306,7 +306,7 @@ void Splitter3dDim2EndToEnd(const std::vector<BackendId>& backends)
{ 1, expectedOutput1 },
{ 2, expectedOutput2 } };
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType>
@@ -386,7 +386,7 @@ void Splitter4dDim0EndToEnd(const std::vector<BackendId>& backends)
std::map<int, std::vector<T>> inputTensorData = {{ 0,inputData }};
std::map<int, std::vector<T>> expectedOutputData = {{ 0, expectedOutput0 }, { 1, expectedOutput1 }};
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType>
@@ -466,7 +466,7 @@ void Splitter4dDim1EndToEnd(const std::vector<BackendId>& backends)
std::map<int, std::vector<T>> inputTensorData = {{ 0,inputData }};
std::map<int, std::vector<T>> expectedOutputData = {{ 0, expectedOutput0 }, { 1, expectedOutput1 }};
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType>
@@ -546,7 +546,7 @@ void Splitter4dDim2EndToEnd(const std::vector<BackendId>& backends)
std::map<int, std::vector<T>> inputTensorData = {{ 0,inputData }};
std::map<int, std::vector<T>> expectedOutputData = {{ 0, expectedOutput0 }, { 1, expectedOutput1 }};
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>>
@@ -613,7 +613,7 @@ void Splitter4dDim3EndToEnd(const std::vector<BackendId>& backends)
std::map<int, std::vector<T>> inputTensorData = {{ 0,inputData }};
std::map<int, std::vector<T>> expectedOutputData = {{ 0, expectedOutput0 }, { 1, expectedOutput1 }};
- EndToEndLayerTestImpl<ArmnnType, ArmnnType>(move(net), inputTensorData, expectedOutputData, backends);
+ EndToEndLayerTestImpl<ArmnnType, ArmnnType>(std::move(net), inputTensorData, expectedOutputData, backends);
}
} // anonymous namespace