IVGCVSW-7080 Remove deprecated code due to be removed in 23.02
* Extended deprecation time of SubgraphView interface to 23.08
Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: Ic0a729ea31402f0b39724da47212ae5cc04465c4
diff --git a/include/armnn/BackendHelper.hpp b/include/armnn/BackendHelper.hpp
index 25d719a..2f8eabd 100644
--- a/include/armnn/BackendHelper.hpp
+++ b/include/armnn/BackendHelper.hpp
@@ -409,19 +409,6 @@
const TransposeDescriptor& descriptor,
Optional<std::string&> reasonIfUnsupported = EmptyOptional());
- ARMNN_DEPRECATED_MSG_REMOVAL_DATE("This function has been deprecated, please use function without "
- "Optional TensorInfos", "23.02")
- bool IsUnidirectionalSequenceLstmSupported(
- const TensorInfo& input,
- const TensorInfo& outputStateIn,
- const TensorInfo& cellStateIn,
- const TensorInfo& output,
- const Optional<TensorInfo>& hiddenStateOutput,
- const Optional<TensorInfo>& cellStateOutput,
- const LstmDescriptor& descriptor,
- const LstmInputParamsInfo& paramsInfo,
- Optional<std::string&> reasonIfUnsupported = EmptyOptional());
-
bool IsUnidirectionalSequenceLstmSupported(
const TensorInfo& input,
const TensorInfo& outputStateIn,
diff --git a/include/armnn/backends/SubgraphView.hpp b/include/armnn/backends/SubgraphView.hpp
index fcb2014..63a9f57 100644
--- a/include/armnn/backends/SubgraphView.hpp
+++ b/include/armnn/backends/SubgraphView.hpp
@@ -117,35 +117,35 @@
unsigned int GetNumOutputSlots() const;
ARMNN_DEPRECATED_MSG_CHANGE_DATE("This function is deprecated and will be changed to return an "
- "IConnectableLayerIterator, until that occurs in 23.02; please use "
- "beginIConnectable() returning public IConnectableLayerIterator", "23.02")
+ "IConnectableLayerIterator, until that occurs in 23.08; please use "
+ "beginIConnectable() returning public IConnectableLayerIterator", "23.08")
Iterator begin();
IConnectableLayerIterator beginIConnectable();
ARMNN_DEPRECATED_MSG_CHANGE_DATE("This function is deprecated and will be changed to return an "
- "IConnectableLayerIterator, until that occurs in 23.02; please use "
- "endIConnectable() returning public IConnectableLayerIterator", "23.02")
+ "IConnectableLayerIterator, until that occurs in 23.08; please use "
+ "endIConnectable() returning public IConnectableLayerIterator", "23.08")
Iterator end();
IConnectableLayerIterator endIConnectable();
ARMNN_DEPRECATED_MSG_CHANGE_DATE("This function is deprecated and will be changed to return an "
- "ConstIConnectableIterator, until that occurs in 23.02; please use "
- "beginIConnectable() returning public ConstIConnectableIterator", "23.02")
+ "ConstIConnectableIterator, until that occurs in 23.08; please use "
+ "beginIConnectable() returning public ConstIConnectableIterator", "23.08")
ConstIterator begin() const;
ConstIConnectableIterator beginIConnectable() const;
ARMNN_DEPRECATED_MSG_CHANGE_DATE("This function is deprecated and will be changed to return an "
- "ConstIConnectableIterator, until that occurs in 23.02; please use "
- "endIConnectable() returning public ConstIConnectableIterator", "23.02")
+ "ConstIConnectableIterator, until that occurs in 23.08; please use "
+ "endIConnectable() returning public ConstIConnectableIterator", "23.08")
ConstIterator end() const;
ConstIConnectableIterator endIConnectable() const;
ARMNN_DEPRECATED_MSG_CHANGE_DATE("This function is deprecated and will be changed to return an "
- "ConstIConnectableIterator, until that occurs in 23.02; please use "
- "cbeginIConnectable() returning public ConstIConnectableIterator", "23.02")
+ "ConstIConnectableIterator, until that occurs in 23.08; please use "
+ "cbeginIConnectable() returning public ConstIConnectableIterator", "23.08")
ConstIterator cbegin() const;
ConstIConnectableIterator cbeginIConnectable() const;
ARMNN_DEPRECATED_MSG_CHANGE_DATE("This function is deprecated and will be changed to return an "
- "ConstIConnectableIterator, until that occurs in 23.02; please use "
- "cendIConnectable() returning public ConstIConnectableIterator", "23.02")
+ "ConstIConnectableIterator, until that occurs in 23.08; please use "
+ "cendIConnectable() returning public ConstIConnectableIterator", "23.08")
ConstIterator cend() const;
ConstIConnectableIterator cendIConnectable() const;
diff --git a/src/armnn/BackendHelper.cpp b/src/armnn/BackendHelper.cpp
index ff899d4..d2048df 100644
--- a/src/armnn/BackendHelper.cpp
+++ b/src/armnn/BackendHelper.cpp
@@ -1405,32 +1405,6 @@
reasonIfUnsupported);
}
-// Forwarding function to maintain ABI stability
-bool LayerSupportHandle::IsUnidirectionalSequenceLstmSupported(const TensorInfo& input,
- const TensorInfo& outputStateIn,
- const TensorInfo& cellStateIn,
- const TensorInfo& output,
- const Optional<TensorInfo>& hiddenStateOutput,
- const Optional<TensorInfo>& cellStateOutput,
- const LstmDescriptor& descriptor,
- const LstmInputParamsInfo& paramsInfo,
- Optional<std::string&> reasonIfUnsupported)
-{
- TensorInfo hiddenStateOutputVal = hiddenStateOutput.has_value() ? hiddenStateOutput.value() : TensorInfo();
- TensorInfo cellStateOutputVal = cellStateOutput.has_value() ? cellStateOutput.value() : TensorInfo();
- TensorInfos infos{input, outputStateIn, cellStateIn, hiddenStateOutputVal, cellStateOutputVal, output};
-
- return IsUnidirectionalSequenceLstmSupported(input,
- outputStateIn,
- cellStateIn,
- hiddenStateOutputVal,
- cellStateOutputVal,
- output,
- descriptor,
- paramsInfo,
- reasonIfUnsupported);
-}
-
bool LayerSupportHandle::IsUnidirectionalSequenceLstmSupported(const TensorInfo& input,
const TensorInfo& outputStateIn,
const TensorInfo& cellStateIn,