diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2021-12-13 18:48:12 +0000 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2022-01-14 16:01:58 +0000 |
| commit | 56ccf68c7858560f2ba00f19076b3cb112970881 (patch) | |
| tree | 6e19cd38aa1d452ca3b9a9a1f68ff42dd64dc1d7 /include | |
| parent | 2db6d5aff3d4f596d4b4018a7b454c2a2c8f7122 (diff) | |
| download | armnn-56ccf68c7858560f2ba00f19076b3cb112970881.tar.gz | |
IVGCVSW-6633 SubgraphView uses IConnectableLayer rather than Layer in its m_Layers
* Added IInputSlot, IOutputSlot and IConnectableLayer to SubgraphView
* Deprecated old member functions
* Removed deprecated calls in ArmNN
* Added GetOwningIConnectableLayer function to IOutputSlot
* Updates ArmNN Core Major version for IOutputSlot ABI break
* Updated Minor version of TfliteParser, OnnxParser and Delegate
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I2a8611bfabf5ae09d3602fe6a4bef166e18117b9
Diffstat (limited to 'include')
| -rw-r--r-- | include/armnn/Deprecated.hpp | 2 | ||||
| -rw-r--r-- | include/armnn/INetwork.hpp | 2 | ||||
| -rw-r--r-- | include/armnn/Version.hpp | 2 | ||||
| -rw-r--r-- | include/armnnOnnxParser/Version.hpp | 2 | ||||
| -rw-r--r-- | include/armnnTfLiteParser/Version.hpp | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/include/armnn/Deprecated.hpp b/include/armnn/Deprecated.hpp index c493adb308..6b7fec6676 100644 --- a/include/armnn/Deprecated.hpp +++ b/include/armnn/Deprecated.hpp @@ -43,6 +43,8 @@ ARMNN_NO_DEPRECATE_WARN_END #define ARMNN_DEPRECATED_MSG(message) [[deprecated(message)]] #define ARMNN_DEPRECATED_MSG_REMOVAL_DATE(message, removed_in_release) \ [[deprecated("Expected to be removed in release " #removed_in_release ". " message)]] +#define ARMNN_DEPRECATED_MSG_CHANGE_DATE(message, signature_changed_in_release) \ +[[deprecated("Expected to have signature changed in release " #signature_changed_in_release ". " message)]] #if defined(__GNUC__) && (__GNUC__ < 6) # define ARMNN_DEPRECATED_ENUM diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index 5d25665dfe..a48ee25f72 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -53,6 +53,8 @@ public: virtual LayerGuid GetOwningLayerGuid() const = 0; + virtual const IConnectableLayer& GetOwningIConnectableLayer() const = 0; + protected: /// Not user deletable. ~IOutputSlot() {} diff --git a/include/armnn/Version.hpp b/include/armnn/Version.hpp index 3a5b568169..7e172246e3 100644 --- a/include/armnn/Version.hpp +++ b/include/armnn/Version.hpp @@ -10,7 +10,7 @@ #define STRINGIFY_MACRO(s) #s // ArmNN version components -#define ARMNN_MAJOR_VERSION 27 +#define ARMNN_MAJOR_VERSION 28 #define ARMNN_MINOR_VERSION 0 #define ARMNN_PATCH_VERSION 0 diff --git a/include/armnnOnnxParser/Version.hpp b/include/armnnOnnxParser/Version.hpp index da3e392bc8..ed9d8690ec 100644 --- a/include/armnnOnnxParser/Version.hpp +++ b/include/armnnOnnxParser/Version.hpp @@ -14,7 +14,7 @@ namespace armnnOnnxParser // OnnxParser version components #define ONNX_PARSER_MAJOR_VERSION 24 -#define ONNX_PARSER_MINOR_VERSION 3 +#define ONNX_PARSER_MINOR_VERSION 4 #define ONNX_PARSER_PATCH_VERSION 0 /// ONNX_PARSER_VERSION: "X.Y.Z" diff --git a/include/armnnTfLiteParser/Version.hpp b/include/armnnTfLiteParser/Version.hpp index b0490cebec..eee2124678 100644 --- a/include/armnnTfLiteParser/Version.hpp +++ b/include/armnnTfLiteParser/Version.hpp @@ -14,7 +14,7 @@ namespace armnnTfLiteParser // TfLiteParser version components #define TFLITE_PARSER_MAJOR_VERSION 24 -#define TFLITE_PARSER_MINOR_VERSION 3 +#define TFLITE_PARSER_MINOR_VERSION 4 #define TFLITE_PARSER_PATCH_VERSION 0 /// TFLITE_PARSER_VERSION: "X.Y.Z" |