diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2019-05-01 14:44:27 +0100 |
|---|---|---|
| committer | Jim Flynn Arm <jim.flynn@arm.com> | 2019-05-02 10:23:48 +0000 |
| commit | b4d7eaef418bfda0b939c757b6206570f70aff8e (patch) | |
| tree | ebe8decb6df6091028d21336d221eb599ab9a503 /include | |
| parent | 93e2e40500b2e0b7a47f3214a9b0499da50476b0 (diff) | |
| download | armnn-b4d7eaef418bfda0b939c757b6206570f70aff8e.tar.gz | |
IVGCVSW-3039 Unify BindingPointInfo declarations
Change-Id: I3deb2b9a37e8a8f8f2ed93c64ed0656ae911e24c
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/armnn/Tensor.hpp | 2 | ||||
| -rw-r--r-- | include/armnnCaffeParser/ICaffeParser.hpp | 2 | ||||
| -rw-r--r-- | include/armnnOnnxParser/IOnnxParser.hpp | 2 | ||||
| -rw-r--r-- | include/armnnTfLiteParser/ITfLiteParser.hpp | 3 | ||||
| -rw-r--r-- | include/armnnTfParser/ITfParser.hpp | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/include/armnn/Tensor.hpp b/include/armnn/Tensor.hpp index 160ccca79c..3cde1ad9ab 100644 --- a/include/armnn/Tensor.hpp +++ b/include/armnn/Tensor.hpp @@ -101,6 +101,8 @@ private: } m_Quantization; }; +using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; + template<typename MemoryType> class BaseTensor { diff --git a/include/armnnCaffeParser/ICaffeParser.hpp b/include/armnnCaffeParser/ICaffeParser.hpp index 9d885f5e1f..62a7b8cd69 100644 --- a/include/armnnCaffeParser/ICaffeParser.hpp +++ b/include/armnnCaffeParser/ICaffeParser.hpp @@ -16,7 +16,7 @@ namespace armnnCaffeParser { -using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; +using BindingPointInfo = armnn::BindingPointInfo; class ICaffeParser; using ICaffeParserPtr = std::unique_ptr<ICaffeParser, void(*)(ICaffeParser* parser)>; diff --git a/include/armnnOnnxParser/IOnnxParser.hpp b/include/armnnOnnxParser/IOnnxParser.hpp index 40b47a597b..d6b9399dd5 100644 --- a/include/armnnOnnxParser/IOnnxParser.hpp +++ b/include/armnnOnnxParser/IOnnxParser.hpp @@ -14,7 +14,7 @@ namespace armnnOnnxParser { -using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; +using BindingPointInfo = armnn::BindingPointInfo; class IOnnxParser; using IOnnxParserPtr = std::unique_ptr<IOnnxParser, void(*)(IOnnxParser* parser)>; diff --git a/include/armnnTfLiteParser/ITfLiteParser.hpp b/include/armnnTfLiteParser/ITfLiteParser.hpp index c591876c90..36b9246ee5 100644 --- a/include/armnnTfLiteParser/ITfLiteParser.hpp +++ b/include/armnnTfLiteParser/ITfLiteParser.hpp @@ -16,8 +16,7 @@ namespace armnnTfLiteParser { -// TODO: revise this: do we really need this for every parser??? -using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; +using BindingPointInfo = armnn::BindingPointInfo; class ITfLiteParser; using ITfLiteParserPtr = std::unique_ptr<ITfLiteParser, void(*)(ITfLiteParser* parser)>; diff --git a/include/armnnTfParser/ITfParser.hpp b/include/armnnTfParser/ITfParser.hpp index e5bbc7ceea..ce85ec7e2f 100644 --- a/include/armnnTfParser/ITfParser.hpp +++ b/include/armnnTfParser/ITfParser.hpp @@ -16,7 +16,7 @@ namespace armnnTfParser { -using BindingPointInfo = std::pair<armnn::LayerBindingId, armnn::TensorInfo>; +using BindingPointInfo = armnn::BindingPointInfo; class ITfParser; using ITfParserPtr = std::unique_ptr<ITfParser, void(*)(ITfParser* parser)>; |