diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2022-02-09 15:13:38 +0000 |
---|---|---|
committer | Francis Murtagh <francis.murtagh@arm.com> | 2022-02-16 10:26:39 +0000 |
commit | bb6c6490b43036400e3c2ff90d3beafe074ab0b1 (patch) | |
tree | 49c05a44c00b0f009fa3913c45dc20496762ec5e /python/pyarmnn | |
parent | 154258132955f0bd74ef26a0cc20b7daca4d7b09 (diff) | |
download | armnn-bb6c6490b43036400e3c2ff90d3beafe074ab0b1.tar.gz |
IVGCVSW-6399 Remove deprecated code 22.02 (FullyConnected)
* Remove deprecated INetwork::AddFullyconnectedLayer() taking weights
as argument as they are now taken as separate input layers.
* Updated test that was using the deprecated function.
* Remove calls in pyarmnn
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: Ibc52ac7fa57afd9033eb226bbc24a09e88a7d361
Diffstat (limited to 'python/pyarmnn')
-rw-r--r-- | python/pyarmnn/src/pyarmnn/__init__.py | 2 | ||||
-rw-r--r-- | python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i | 29 | ||||
-rw-r--r-- | python/pyarmnn/test/test_network.py | 29 |
3 files changed, 1 insertions, 59 deletions
diff --git a/python/pyarmnn/src/pyarmnn/__init__.py b/python/pyarmnn/src/pyarmnn/__init__.py index 5f95cb0725..b994bb7bb7 100644 --- a/python/pyarmnn/src/pyarmnn/__init__.py +++ b/python/pyarmnn/src/pyarmnn/__init__.py @@ -38,7 +38,7 @@ try: from ._generated.pyarmnn_deserializer import IDeserializer except ImportError as err: logger = logging.getLogger(__name__) - message = "Your ArmNN library instance does not have an armnn models parser funcionality. " + message = "Your ArmNN library instance does not have ArmNN model (.armnn) parser functionality. " logger.warning("%s Skipped IDeserializer import.", message) logger.debug(str(err)) diff --git a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i index 643f99f53a..eb8dede260 100644 --- a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i +++ b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i @@ -1105,35 +1105,6 @@ public: %feature("docstring", " - Adds a Fully Connected layer to the network with input weights and optional bias. - Also known as a Linear or Dense layer. - - Args: - fullyConnectedDescriptor (FullyConnectedDescriptor): Description of the fully connected layer. - weights (ConstTensor): Tensor for the weights data. - biases (ConstTensor): Optional tensor for the bias data. - name (str): Optional name for the layer. - - Returns: - IConnectableLayer: Interface for configuring the layer. - ") AddFullyConnectedLayer; - armnn::IConnectableLayer* AddFullyConnectedLayer(const armnn::FullyConnectedDescriptor& fullyConnectedDescriptor, - const armnn::ConstTensor& weights, - armnn::ConstTensor* biases = nullptr, - const char* name = nullptr) { - ARMNN_NO_DEPRECATE_WARN_BEGIN - if (biases) { - return $self->AddFullyConnectedLayer(fullyConnectedDescriptor, weights, - armnn::Optional<armnn::ConstTensor>(*biases), name); - } else { - return $self->AddFullyConnectedLayer(fullyConnectedDescriptor, weights, - armnn::Optional<armnn::ConstTensor>(), name); - } - ARMNN_NO_DEPRECATE_WARN_END - } - - %feature("docstring", - " Adds a 2D Transpose Convolution layer to the network. Args: diff --git a/python/pyarmnn/test/test_network.py b/python/pyarmnn/test/test_network.py index e56621a23b..27ad70be3b 100644 --- a/python/pyarmnn/test/test_network.py +++ b/python/pyarmnn/test/test_network.py @@ -249,35 +249,6 @@ def test_serialize_to_dot_mode_readonly(network_file, get_runtime, tmpdir): def test_network_method_exists(method): assert getattr(ann.INetwork, method, None) - -def test_fullyconnected_layer_optional_none(): - net = ann.INetwork() - layer = net.AddFullyConnectedLayer(ann.FullyConnectedDescriptor(), - ann.ConstTensor()) - - assert layer - - -def test_fullyconnected_layer_optional_provided(): - net = ann.INetwork() - layer = net.AddFullyConnectedLayer(ann.FullyConnectedDescriptor(), - ann.ConstTensor(), - ann.ConstTensor()) - - assert layer - - -def test_fullyconnected_layer_all_args(): - net = ann.INetwork() - layer = net.AddFullyConnectedLayer(ann.FullyConnectedDescriptor(), - ann.ConstTensor(), - ann.ConstTensor(), - 'NAME1') - - assert layer - assert 'NAME1' == layer.GetName() - - def test_DepthwiseConvolution2d_layer_optional_none(): net = ann.INetwork() layer = net.AddDepthwiseConvolution2dLayer(convolution2dDescriptor=ann.DepthwiseConvolution2dDescriptor(), |