From 02a22e7c84f007f742eb43d221cc37e2bd591edb Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Mon, 17 Jul 2023 14:15:17 +0100 Subject: Update version in pyarmnn * This updates checks in pyarmnn to new version * Updates documents to newer version Change-Id: If1321ea4e74a10993b205cce1d3618844b0ddc06 Signed-off-by: Nikhil Raj --- python/pyarmnn/README.md | 8 ++++---- python/pyarmnn/examples/image_classification/README.md | 2 +- python/pyarmnn/examples/keyword_spotting/README.md | 2 +- python/pyarmnn/examples/object_detection/README.md | 2 +- python/pyarmnn/examples/speech_recognition/README.md | 2 +- python/pyarmnn/src/pyarmnn/_version.py | 2 +- python/pyarmnn/test/test_setup.py | 8 ++++---- python/pyarmnn/test/test_version.py | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/python/pyarmnn/README.md b/python/pyarmnn/README.md index 0defd910b0..d155703055 100644 --- a/python/pyarmnn/README.md +++ b/python/pyarmnn/README.md @@ -69,8 +69,8 @@ PyArmNN can be distributed as a source package or a binary package (wheel). Binary package is platform dependent, the name of the package will indicate the platform it was built for, e.g.: -* Linux x86 64bit machine: pyarmnn-32.0.0-cp36-cp36m-*linux_x86_64*.whl -* Linux Aarch 64 bit machine: pyarmnn-32.0.0-cp36-cp36m-*linux_aarch64*.whl +* Linux x86 64bit machine: pyarmnn-33.0.0-cp36-cp36m-*linux_x86_64*.whl +* Linux Aarch 64 bit machine: pyarmnn-33.0.0-cp36-cp36m-*linux_aarch64*.whl The source package is platform independent but installation involves compilation of Arm NN python extension. You will need to have g++ compatible with C++ 14 standard and a python development library installed on the build machine. @@ -110,7 +110,7 @@ $ pip show pyarmnn You can also verify it by running the following and getting output similar to below: ```bash $ python -c "import pyarmnn as ann;print(ann.GetVersion())" -'32.0.0' +'33.0.0' ``` @@ -148,7 +148,7 @@ $ pip show pyarmnn You can also verify it by running the following and getting output similar to below: ```bash $ python -c "import pyarmnn as ann;print(ann.GetVersion())" -'32.0.0' +'33.0.0' ``` # PyArmNN API overview diff --git a/python/pyarmnn/examples/image_classification/README.md b/python/pyarmnn/examples/image_classification/README.md index fa0f89eba0..7eafc11c6b 100644 --- a/python/pyarmnn/examples/image_classification/README.md +++ b/python/pyarmnn/examples/image_classification/README.md @@ -20,7 +20,7 @@ $ pip show pyarmnn You can also verify it by running the following and getting output similar to below: ```bash $ python -c "import pyarmnn as ann;print(ann.GetVersion())" -'32.0.0' +'33.0.0' ``` ##### Dependencies diff --git a/python/pyarmnn/examples/keyword_spotting/README.md b/python/pyarmnn/examples/keyword_spotting/README.md index 905cae1070..66611092ee 100644 --- a/python/pyarmnn/examples/keyword_spotting/README.md +++ b/python/pyarmnn/examples/keyword_spotting/README.md @@ -18,7 +18,7 @@ You can also verify it by running the following and getting output similar to be ```bash $ python -c "import pyarmnn as ann;print(ann.GetVersion())" -'32.0.0' +'33.0.0' ``` ### Dependencies diff --git a/python/pyarmnn/examples/object_detection/README.md b/python/pyarmnn/examples/object_detection/README.md index 3c4b100fd4..991f97d8ab 100644 --- a/python/pyarmnn/examples/object_detection/README.md +++ b/python/pyarmnn/examples/object_detection/README.md @@ -54,7 +54,7 @@ $ pip show pyarmnn You can also verify it by running the following and getting output similar to below: ```bash $ python -c "import pyarmnn as ann;print(ann.GetVersion())" -'32.0.0' +'33.0.0' ``` ##### Dependencies diff --git a/python/pyarmnn/examples/speech_recognition/README.md b/python/pyarmnn/examples/speech_recognition/README.md index af0196f4bf..b50a7b3608 100644 --- a/python/pyarmnn/examples/speech_recognition/README.md +++ b/python/pyarmnn/examples/speech_recognition/README.md @@ -18,7 +18,7 @@ You can also verify it by running the following and getting output similar to be ```bash $ python -c "import pyarmnn as ann;print(ann.GetVersion())" -'32.0.0' +'33.0.0' ``` ### Dependencies diff --git a/python/pyarmnn/src/pyarmnn/_version.py b/python/pyarmnn/src/pyarmnn/_version.py index 0441d33459..075f92e7ba 100644 --- a/python/pyarmnn/src/pyarmnn/_version.py +++ b/python/pyarmnn/src/pyarmnn/_version.py @@ -24,7 +24,7 @@ def check_armnn_version(installed_armnn_version: str, expected_armnn_version: st """Compares expected Arm NN version and Arm NN version used to build the package. Args: - installed_armnn_version (str): Arm NN version used to generate the package (e.g. 32.0.0) + installed_armnn_version (str): Arm NN version used to generate the package (e.g. 33.0.0) expected_armnn_version (str): Expected Arm NN version Returns: diff --git a/python/pyarmnn/test/test_setup.py b/python/pyarmnn/test/test_setup.py index 8275a537b4..3e46174b07 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('32.0.0', '32.0.0') + check_armnn_version('33.0.0', '33.0.0') def test_incorrect_armnn_version(): with pytest.raises(AssertionError) as err: - check_armnn_version('32.0.0', '32.1.0') + check_armnn_version('32.1.0', '33.0.0') - assert 'Expected ArmNN version is 32.1.0 but installed ArmNN version is 32.0.0' in str(err.value) + assert 'Expected ArmNN version is 33.0.0 but installed ArmNN version is 32.1.0' in str(err.value) def test_armnn_version_patch_does_not_matter(): - check_armnn_version('32.0.0', '32.0.1') + check_armnn_version('32.0.0', '33.0.1') diff --git a/python/pyarmnn/test/test_version.py b/python/pyarmnn/test/test_version.py index 8ba93efd3d..d4d9becd08 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 "32.1.0.dev1" == v.__version__ + assert "33.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 "32.1.0" == v.__arm_ml_version__ + assert "33.0.0" == v.__arm_ml_version__ del os.environ["PYARMNN_DEV_VER"] del v -- cgit v1.2.1