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/armnn/Network.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/armnn/Network.hpp')
| -rw-r--r-- | src/armnn/Network.hpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 54c3497c90..c22c865e3b 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -133,24 +133,17 @@ public: IConnectableLayer* AddFloorLayer(const char* name = nullptr); IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor, - const Optional<ConstTensor>& weights, - const Optional<ConstTensor>& biases, const char* name = nullptr); IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor, - const ConstTensor& weights, + const Optional<ConstTensor>& weights, const Optional<ConstTensor>& biases, const char* name = nullptr); ARMNN_DEPRECATED_MSG("This AddFullyConnectedLayer overload is deprecated") IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, - const char* name = nullptr); - - ARMNN_DEPRECATED_MSG("This AddFullyConnectedLayer overload is deprecated") - IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor, - const ConstTensor& weights, - const ConstTensor& biases, + const Optional<ConstTensor>& biases, const char* name = nullptr); ARMNN_DEPRECATED_MSG("This AddGatherLayer overload is deprecated") @@ -288,11 +281,6 @@ private: const Optional<ConstTensor>& biases, const char* name); - IConnectableLayer* AddFullyConnectedLayerImpl(const FullyConnectedDescriptor& fullyConnectedDescriptor, - const Optional<ConstTensor>& weights, - const Optional<ConstTensor>& biases, - const char* name); - bool GetShapeInferenceMethod(); NetworkOptions m_NetworkOptions; |