aboutsummaryrefslogtreecommitdiff
path: root/python/pyarmnn/test
diff options
context:
space:
mode:
authorJames Conroy <james.conroy@arm.com>2022-06-21 11:31:47 +0000
committerJames Conroy <james.conroy@arm.com>2022-06-21 11:31:47 +0000
commita0f8b15d4ddb5075f380003ff31b271d389d3b66 (patch)
tree5a4f351ee688bd760449c82c455b0e324b11f88d /python/pyarmnn/test
parent03bf98a8bc51ad20eef4b9ca5fbf6ce15e063721 (diff)
downloadarmnn-a0f8b15d4ddb5075f380003ff31b271d389d3b66.tar.gz
Revert "IVGCVSW-6873 Import inputs but don't export outputs fails."
This reverts commit 03bf98a8bc51ad20eef4b9ca5fbf6ce15e063721. Reason for revert: Caused failures in tests located in internal repo. Change-Id: If35cb0ede349b270e4e7827324382e09455d8cfa
Diffstat (limited to 'python/pyarmnn/test')
-rw-r--r--python/pyarmnn/test/test_modeloption.py9
-rw-r--r--python/pyarmnn/test/test_runtime.py4
-rw-r--r--python/pyarmnn/test/test_setup.py8
-rw-r--r--python/pyarmnn/test/test_version.py4
4 files changed, 11 insertions, 14 deletions
diff --git a/python/pyarmnn/test/test_modeloption.py b/python/pyarmnn/test/test_modeloption.py
index a47d2da358..c03d4a8cce 100644
--- a/python/pyarmnn/test/test_modeloption.py
+++ b/python/pyarmnn/test/test_modeloption.py
@@ -71,8 +71,7 @@ def test_optimizer_options_with_model_opt():
False,
ShapeInferenceMethod_InferAndValidate,
True,
- [a],
- True)
+ [a])
mo = oo.m_ModelOptions
@@ -113,8 +112,7 @@ def test_optimizer_options_fail():
False,
ShapeInferenceMethod_InferAndValidate,
True,
- a,
- True)
+ a)
assert "Wrong number or type of arguments" in str(err.value)
@@ -124,8 +122,7 @@ def test_optimizer_options_fail():
True,
ShapeInferenceMethod_InferAndValidate,
True,
- [a],
- True)
+ [a])
assert "BFloat16 and Float16 optimization cannot be enabled at the same time" in str(err.value)
diff --git a/python/pyarmnn/test/test_runtime.py b/python/pyarmnn/test/test_runtime.py
index a6c4e1dcc0..a37772c5df 100644
--- a/python/pyarmnn/test/test_runtime.py
+++ b/python/pyarmnn/test/test_runtime.py
@@ -156,8 +156,8 @@ def test_load_network_properties_provided(random_runtime):
opt_network, _ = ann.Optimize(network, preferred_backends,
runtime.GetDeviceSpec(), ann.OptimizerOptions())
- inputSource = ann.MemorySource_Undefined
- outputSource = ann.MemorySource_Undefined
+ inputSource = ann.MemorySource_Malloc
+ outputSource = ann.MemorySource_Malloc
properties = ann.INetworkProperties(False, inputSource, outputSource)
net_id, messages = runtime.LoadNetwork(opt_network, properties)
assert "" == messages
diff --git a/python/pyarmnn/test/test_setup.py b/python/pyarmnn/test/test_setup.py
index 27feda2647..4a6f930cbf 100644
--- a/python/pyarmnn/test/test_setup.py
+++ b/python/pyarmnn/test/test_setup.py
@@ -87,15 +87,15 @@ def test_gcc_serch_path():
def test_armnn_version():
- check_armnn_version('30.0.0', '30.0.0')
+ check_armnn_version('29.0.0', '29.0.0')
def test_incorrect_armnn_version():
with pytest.raises(AssertionError) as err:
- check_armnn_version('30.0.0', '30.1.0')
+ check_armnn_version('29.0.0', '29.1.0')
- assert 'Expected ArmNN version is 30.1.0 but installed ArmNN version is 30.0.0' in str(err.value)
+ assert 'Expected ArmNN version is 29.1.0 but installed ArmNN version is 29.0.0' in str(err.value)
def test_armnn_version_patch_does_not_matter():
- check_armnn_version('30.0.0', '30.0.1')
+ check_armnn_version('29.0.0', '29.0.1')
diff --git a/python/pyarmnn/test/test_version.py b/python/pyarmnn/test/test_version.py
index 83606ab15b..f74ae020cf 100644
--- a/python/pyarmnn/test/test_version.py
+++ b/python/pyarmnn/test/test_version.py
@@ -18,7 +18,7 @@ def test_dev_version():
importlib.reload(v)
- assert "30.0.0.dev1" == v.__version__
+ assert "29.0.0.dev1" == v.__version__
del os.environ["PYARMNN_DEV_VER"]
del v
@@ -30,7 +30,7 @@ def test_arm_version_not_affected():
importlib.reload(v)
- assert "30.0.0" == v.__arm_ml_version__
+ assert "29.0.0" == v.__arm_ml_version__
del os.environ["PYARMNN_DEV_VER"]
del v