diff options
author | Mike Kelly <mike.kelly@arm.com> | 2023-04-05 12:51:10 +0100 |
---|---|---|
committer | Mike Kelly <mike.kelly@arm.com> | 2023-04-05 15:08:02 +0100 |
commit | 1ec5f85a0b98785fee16dd908b5d193e2b8a52db (patch) | |
tree | f6a7b28e078153026424f1916fde8e34e1e2dc3e | |
parent | 1bf35f5b8b480b2af3e904cb64e4bd5c6147b0fb (diff) | |
download | armnn-1ec5f85a0b98785fee16dd908b5d193e2b8a52db.tar.gz |
IVGCVSW-7673 Fix for failing build
* Added ARMNN_NO_DEPRECATE_WARN_ to test files for Tosa and DynamicSample.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I2f1b771d719cf637e17cc423cd2211db9643a6e8
6 files changed, 18 insertions, 8 deletions
diff --git a/samples/DynamicSample.cpp b/samples/DynamicSample.cpp index e4d2b28a4b..65732ca440 100644 --- a/samples/DynamicSample.cpp +++ b/samples/DynamicSample.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020-2021,2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include <armnn/INetwork.hpp> @@ -21,7 +21,7 @@ int main() IConnectableLayer* input0 = myNetwork->AddInputLayer(0); IConnectableLayer* input1 = myNetwork->AddInputLayer(1); - IConnectableLayer* add = myNetwork->AddAdditionLayer(); + IConnectableLayer* add = myNetwork->AddElementwiseBinaryLayer(BinaryOperation::Add); IConnectableLayer* output = myNetwork->AddOutputLayer(0); input0->GetOutputSlot(0).Connect(add->GetInputSlot(0)); diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp index 6a673c6e93..a55146e704 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2019-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -1568,7 +1568,9 @@ void SampleDynamicBackendEndToEndTestImpl() IConnectableLayer* input0 = net->AddInputLayer(0); IConnectableLayer* input1 = net->AddInputLayer(1); + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer* add = net->AddAdditionLayer(); + ARMNN_NO_DEPRECATE_WARN_END IConnectableLayer* output = net->AddOutputLayer(0); input0->GetOutputSlot(0).Connect(add->GetInputSlot(0)); diff --git a/src/backends/backendsCommon/test/MultiplicationEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/MultiplicationEndToEndTestImpl.hpp index 40442e2d47..ba871dab8b 100644 --- a/src/backends/backendsCommon/test/MultiplicationEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/MultiplicationEndToEndTestImpl.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once @@ -30,8 +30,9 @@ armnn::INetworkPtr CreateMultiplicationNetwork(const armnn::TensorShape& inputXS TensorInfo outputTensorInfo(outputShape, DataType, qScale, qOffset); - + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer* multiplication = network->AddMultiplicationLayer("multiplication"); + ARMNN_NO_DEPRECATE_WARN_END IConnectableLayer* inputX = network->AddInputLayer(0, "inputX"); IConnectableLayer* inputY = network->AddInputLayer(1, "inputY"); IConnectableLayer* output = network->AddOutputLayer(0, "output"); diff --git a/src/backends/backendsCommon/test/SubtractionEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/SubtractionEndToEndTestImpl.hpp index 747fe26df0..1a1b9fcc50 100644 --- a/src/backends/backendsCommon/test/SubtractionEndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/SubtractionEndToEndTestImpl.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once @@ -30,8 +30,9 @@ armnn::INetworkPtr CreateSubtractionNetwork(const armnn::TensorShape& inputXShap TensorInfo outputTensorInfo(outputShape, DataType, qScale, qOffset); - + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer* subtraction = network->AddSubtractionLayer("subtraction"); + ARMNN_NO_DEPRECATE_WARN_END IConnectableLayer* inputX = network->AddInputLayer(0, "inputX"); IConnectableLayer* inputY = network->AddInputLayer(1, "inputY"); IConnectableLayer* output = network->AddOutputLayer(0, "output"); diff --git a/src/backends/tosaCommon/test/OneToOneMappingTests.cpp b/src/backends/tosaCommon/test/OneToOneMappingTests.cpp index 6e532abcf7..0cf8002cd1 100644 --- a/src/backends/tosaCommon/test/OneToOneMappingTests.cpp +++ b/src/backends/tosaCommon/test/OneToOneMappingTests.cpp @@ -34,7 +34,9 @@ TEST_CASE("GetTosaMappingFromLayer_AdditionLayer") IConnectableLayer* input0 = net->AddInputLayer(0, "input0"); IConnectableLayer* input1 = net->AddInputLayer(1, "input1"); + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer* add = net->AddAdditionLayer("add"); + ARMNN_NO_DEPRECATE_WARN_END IConnectableLayer* output = net->AddOutputLayer(0, "output"); input0->GetOutputSlot(0).Connect(add->GetInputSlot(0)); @@ -329,7 +331,9 @@ TEST_CASE("GetTosaMappingFromLayer_MultiplicationLayer") IConnectableLayer* input0 = net->AddInputLayer(0, "input0"); IConnectableLayer* input1 = net->AddInputLayer(1, "input1"); + ARMNN_NO_DEPRECATE_WARN_BEGIN IConnectableLayer* add = net->AddMultiplicationLayer("multiplication"); + ARMNN_NO_DEPRECATE_WARN_END IConnectableLayer* output = net->AddOutputLayer(0, "output"); input0->GetOutputSlot(0).Connect(add->GetInputSlot(0)); diff --git a/src/backends/tosaReference/test/TosaRefOptimizedNetworkTests.cpp b/src/backends/tosaReference/test/TosaRefOptimizedNetworkTests.cpp index 64b6805d2c..86cbc4e3c0 100644 --- a/src/backends/tosaReference/test/TosaRefOptimizedNetworkTests.cpp +++ b/src/backends/tosaReference/test/TosaRefOptimizedNetworkTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -21,7 +21,9 @@ TEST_CASE("SimpleSupportedOptimizedNetwork") auto inputLayer1 = network->AddInputLayer(0, "input_1"); auto inputLayer2 = network->AddInputLayer(1, "input_2"); + ARMNN_NO_DEPRECATE_WARN_BEGIN auto addLayer = network->AddAdditionLayer("add"); + ARMNN_NO_DEPRECATE_WARN_END auto outputLayer = network->AddOutputLayer(2, "output"); armnn::TensorInfo tensorInfo{{4}, armnn::DataType::Float32}; |