commit 446707fbc95ffedc7b2e463679dfcef1e827f649
author Jan Eilers <jan.eilers@arm.com> Thu Dec 16 11:28:37 2021 +0000
committer Francis Murtagh <francis.murtagh@arm.com> Fri Dec 17 14:10:07 2021 +0000
tree 267133674d698f1cf58ba40e45a37baea4c256fd
parent 19bde17aa6971487d859f69dab980797bd7508b3

Remove deprecated code for 22.02

Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: I9114288e705936b12129b01bfd482bbe1260f80b

python/pyarmnn/src/pyarmnn/swig/modules/armnn_runtime.i

diff --git a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_runtime.i b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_runtime.i
index e56464d..42683ad 100644
--- a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_runtime.i
+++ b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_runtime.i
@@ -312,27 +312,5 @@
 
 }
 
-%extend INetworkProperties {
-    %feature("docstring",
-             "
-    Structure for holding network properties.
-
-            Contains:
-    m_ImportEnabled (bool): Enable import.
-
-            m_ExportEnabled (bool): Enable export.
-
-    ") INetworkProperties;
-    INetworkProperties(bool importEnabled = false, bool exportEnabled = false) {
-        ARMNN_NO_DEPRECATE_WARN_BEGIN
-        return new INetworkProperties(importEnabled, exportEnabled);
-        ARMNN_NO_DEPRECATE_WARN_END
-    }
-    %pythonprepend INetworkProperties(bool, bool) %{
-        import warnings
-        warnings.warn("Deprecated: Use constructor with MemorySource argument instead.", DeprecationWarning)
-    %}
-}
-
 }
 

python/pyarmnn/test/test_runtime.py

diff --git a/python/pyarmnn/test/test_runtime.py b/python/pyarmnn/test/test_runtime.py
index e558e84..a37772c 100644
--- a/python/pyarmnn/test/test_runtime.py
+++ b/python/pyarmnn/test/test_runtime.py
@@ -156,7 +156,9 @@
     opt_network, _ = ann.Optimize(network, preferred_backends,
                                   runtime.GetDeviceSpec(), ann.OptimizerOptions())
 
-    properties = ann.INetworkProperties(True, True)
+    inputSource = ann.MemorySource_Malloc
+    outputSource = ann.MemorySource_Malloc
+    properties = ann.INetworkProperties(False, inputSource, outputSource)
     net_id, messages = runtime.LoadNetwork(opt_network, properties)
     assert "" == messages
     assert net_id == 0
@@ -184,11 +186,6 @@
     assert net_id == 0
 
 
-def test_network_properties_deprecated_constructor():
-    with pytest.warns(DeprecationWarning):
-        warnings.warn("Deprecated: Use constructor with MemorySource argument instead.", DeprecationWarning)
-
-
 def test_unload_network_fails_for_invalid_net_id(random_runtime):
     preferred_backends = random_runtime[0]
     network = random_runtime[1]