diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2023-03-31 18:00:00 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2023-03-31 18:03:19 +0100 |
| commit | 1a05aad6d5adf3b25848ffd873a0e0e82756aa06 (patch) | |
| tree | 973583209a4eeb916b42922189dc312a4d1effa2 /src/armnn/test/optimizations | |
| parent | c4fb0dd4145e05123c546458ba5d281abfcc2b28 (diff) | |
| download | armnn-1a05aad6d5adf3b25848ffd873a0e0e82756aa06.tar.gz | |
Revert "IVGCVSW-3808 Deprecation notices for old ElementwiseBinary layers"
This reverts commit 52e90bf59ecbe90d33368d8fc1fd120f07658aaf.
Change-Id: I5a0d244593d8e760ee7ba0c9d38c02377e1bdc24
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Diffstat (limited to 'src/armnn/test/optimizations')
| -rw-r--r-- | src/armnn/test/optimizations/FuseActivationTests.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/armnn/test/optimizations/FuseActivationTests.cpp b/src/armnn/test/optimizations/FuseActivationTests.cpp index 2ccbc9418c..3b8917192d 100644 --- a/src/armnn/test/optimizations/FuseActivationTests.cpp +++ b/src/armnn/test/optimizations/FuseActivationTests.cpp @@ -1,10 +1,11 @@ // -// Copyright © 2020-2023 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "LayersFwd.hpp" +#include <Network.hpp> #include <ResolveType.hpp> #include <armnn/INetwork.hpp> #include <GraphUtils.hpp> @@ -237,7 +238,6 @@ public: } }; -ARMNN_NO_DEPRECATE_WARN_BEGIN template<DataType ArmnnType, typename T = ResolveType<ArmnnType>> struct MultiplicationTest { @@ -272,9 +272,7 @@ struct MultiplicationTest return {}; } }; -ARMNN_NO_DEPRECATE_WARN_END -ARMNN_NO_DEPRECATE_WARN_BEGIN template<DataType ArmnnType, typename T = ResolveType<ArmnnType>> struct AdditionTest { @@ -309,9 +307,7 @@ struct AdditionTest return {}; } }; -ARMNN_NO_DEPRECATE_WARN_END -ARMNN_NO_DEPRECATE_WARN_BEGIN template<DataType ArmnnType, typename T = ResolveType<ArmnnType>> struct SubtractionTest { @@ -346,9 +342,7 @@ struct SubtractionTest return {}; } }; -ARMNN_NO_DEPRECATE_WARN_END -ARMNN_NO_DEPRECATE_WARN_BEGIN template<DataType ArmnnType, typename T = ResolveType<ArmnnType>> struct DivisionTest { @@ -383,7 +377,6 @@ struct DivisionTest return {}; } }; -ARMNN_NO_DEPRECATE_WARN_END template<typename LayerTest, DataType ArmnnType> |