diff options
author | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-07-13 19:46:11 +0100 |
---|---|---|
committer | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-08-06 09:25:26 +0000 |
commit | 81beae3a870004795275e9266bc43d845b9f78db (patch) | |
tree | 70af86f3c36c8e330c72770e6f1419ca7b2a4bb8 /src/armnnDeserializer/Deserializer.hpp | |
parent | 95e9efc28ce70a8cda93e722f5ce90ebc96bdd95 (diff) | |
download | armnn-81beae3a870004795275e9266bc43d845b9f78db.tar.gz |
IVGCVSW-6119 ConstTensorsAsInput: FullyConnected
* Constant weights and biases are now stored as Constant layers.
* Updated Serializer, Deserializer and unit tests to reflect this.
* Updated TfLiteDelegate, TfLiteParser and OnnxParser.
* Updated Schema with IsConstant and ConstantTensorsAsInputs.
* Updated Ref backend to handle constant weights and
bias as inputs rather than reading from member variables.
* Added dynamic or constant input EndToEnd tests.
!android-nn-driver:5959
Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: Ibf3cf437df1100e4b322b0d303c575c6339f9696
Diffstat (limited to 'src/armnnDeserializer/Deserializer.hpp')
-rw-r--r-- | src/armnnDeserializer/Deserializer.hpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index b1362c44b6..b4dc68b72d 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -143,9 +143,12 @@ private: void ParseTransposeConvolution2d(GraphPtr graph, unsigned int layerIndex); void ParseUnidirectionalSequenceLstm(GraphPtr graph, unsigned int layerIndex); - void RegisterInputSlots(GraphPtr graph, uint32_t layerIndex, - armnn::IConnectableLayer* layer); - void RegisterOutputSlots(GraphPtr graph, uint32_t layerIndex, + void RegisterInputSlots(GraphPtr graph, + uint32_t layerIndex, + armnn::IConnectableLayer* layer, + std::vector<unsigned int> ignoreSlots = {}); + void RegisterOutputSlots(GraphPtr graph, + uint32_t layerIndex, armnn::IConnectableLayer* layer); // NOTE index here must be from flatbuffer object index property @@ -171,6 +174,9 @@ private: // Default values to zero for backward compatibility unsigned int m_WeightsLayoutScheme = 0; + + // Default values to zero for backward compatibility + unsigned int m_ConstTensorsAsInputs = 0; }; FeatureVersions GetFeatureVersions(GraphPtr graph); |