diff options
-rw-r--r-- | include/armnn/Descriptors.hpp | 16 | ||||
-rw-r--r-- | src/armnn/Descriptors.cpp | 18 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/TensorCopyUtils.hpp | 9 |
4 files changed, 0 insertions, 44 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 3a571a66e8..f1ac17f4c6 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -1588,22 +1588,6 @@ struct BatchMatMulDescriptor : BaseDescriptor DataLayout m_DataLayoutX; DataLayout m_DataLayoutY; - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. Use ABI Stable " - "GetAxesToMul(DataLayout dataLayout, const TensorShape& tensorShape) instead.", - "23.05") - static std::pair<std::pair<unsigned int, unsigned int>, std::pair<unsigned int, unsigned int>> GetAxesToMul( - const BatchMatMulDescriptor& desc, - const TensorShape& tensorXShape, - const TensorShape& tensorYShape); - - ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This method is deprecated. Use ABI Stable " - "GetAxesNotMul(DataLayout dataLayout, const TensorShape& tensorShape) instead.", - "23.05") - static std::pair<std::vector<unsigned int>, std::vector<unsigned int>> GetAxesNotMul( - const BatchMatMulDescriptor& desc, - const TensorShape& inputXShape, - const TensorShape& inputYShape); - /// Static helper to get the two axes (for each input) for multiplication static std::pair<unsigned int, unsigned int> GetAxesToMul( DataLayout dataLayout, diff --git a/src/armnn/Descriptors.cpp b/src/armnn/Descriptors.cpp index 226d121edc..a1419cfbf7 100644 --- a/src/armnn/Descriptors.cpp +++ b/src/armnn/Descriptors.cpp @@ -455,24 +455,6 @@ uint32_t DepthwiseConvolution2dDescriptor::GetNumInputs() const return armnn::GetNumInputs(m_BiasEnabled); } -std::pair<std::pair<unsigned int, unsigned int>, std::pair<unsigned int, unsigned int>> -BatchMatMulDescriptor::GetAxesToMul( - const BatchMatMulDescriptor& desc, - const TensorShape& tensorXShape, - const TensorShape& tensorYShape) -{ - return { GetAxesToMul(desc.m_DataLayoutX, tensorXShape), - GetAxesToMul(desc.m_DataLayoutY, tensorYShape) }; -} -std::pair<std::vector<unsigned int>, std::vector<unsigned int>> BatchMatMulDescriptor::GetAxesNotMul( - const BatchMatMulDescriptor& desc, - const TensorShape& inputXShape, - const TensorShape& inputYShape) -{ - return { GetAxesNotMul(desc.m_DataLayoutX, inputXShape), - GetAxesNotMul(desc.m_DataLayoutY, inputYShape) }; -} - std::pair<unsigned int, unsigned int> BatchMatMulDescriptor::GetAxesToMul( DataLayout dataLayout, const TensorShape& tensorShape) diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 7c24f9ca10..5d8fb1a953 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -63,7 +63,6 @@ list(APPEND armnnBackendsCommonUnitTests_sources SubtractionEndToEndTestImpl.hpp TileEndToEndTestImpl.hpp TransposeEndToEndTestImpl.hpp - TensorCopyUtils.hpp WorkloadFactoryHelper.hpp WorkloadUtilsTest.cpp layerTests/AbsTestImpl.cpp diff --git a/src/backends/backendsCommon/test/TensorCopyUtils.hpp b/src/backends/backendsCommon/test/TensorCopyUtils.hpp deleted file mode 100644 index e0aa7a0c3c..0000000000 --- a/src/backends/backendsCommon/test/TensorCopyUtils.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This file is deprecated and will be removed soon. -// Please use the new header in armnnTestUtils instead. -// This will use the new armnnTestUtils header. -#include <armnnTestUtils/TesnorCopyUtils.hpp>
\ No newline at end of file |