From d7e3b75ed641406e44dd2b256ad7b0fad931dc1f Mon Sep 17 00:00:00 2001 From: Nikhil Raj Date: Wed, 15 Nov 2023 14:23:19 +0000 Subject: IVGCVSW-7936 Update ArmNN minor version and opaque delegate version * Opaque delegate was broken by https://review.mlplatform.org/c/ml/armnn/+/10493/ * Updated ArmNN minor version in pyarmnn Signed-off-by: Nikhil Raj Change-Id: I9eb3a2901c9383b95079b092e05373680781b1ab --- delegate/opaque/include/Version.hpp | 2 +- include/armnn/Version.hpp | 2 +- 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 | 4 ++-- python/pyarmnn/test/test_setup.py | 8 ++++---- python/pyarmnn/test/test_version.py | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/delegate/opaque/include/Version.hpp b/delegate/opaque/include/Version.hpp index 6b32cf482f..c28799efc9 100644 --- a/delegate/opaque/include/Version.hpp +++ b/delegate/opaque/include/Version.hpp @@ -13,7 +13,7 @@ namespace armnnOpaqueDelegate #define STRINGIFY_MACRO(s) #s // ArmNN Delegate version components -#define OPAQUE_DELEGATE_MAJOR_VERSION 1 +#define OPAQUE_DELEGATE_MAJOR_VERSION 2 #define OPAQUE_DELEGATE_MINOR_VERSION 0 #define OPAQUE_DELEGATE_PATCH_VERSION 0 diff --git a/include/armnn/Version.hpp b/include/armnn/Version.hpp index 2a62c1db83..d1050db3c0 100644 --- a/include/armnn/Version.hpp +++ b/include/armnn/Version.hpp @@ -11,7 +11,7 @@ // ArmNN version components #define ARMNN_MAJOR_VERSION 33 -#define ARMNN_MINOR_VERSION 0 +#define ARMNN_MINOR_VERSION 1 #define ARMNN_PATCH_VERSION 0 /// ARMNN_VERSION: "X.Y.Z" diff --git a/python/pyarmnn/README.md b/python/pyarmnn/README.md index d155703055..b510c361c7 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-33.0.0-cp36-cp36m-*linux_x86_64*.whl -* Linux Aarch 64 bit machine: pyarmnn-33.0.0-cp36-cp36m-*linux_aarch64*.whl +* Linux x86 64bit machine: pyarmnn-33.1.0-cp36-cp36m-*linux_x86_64*.whl +* Linux Aarch 64 bit machine: pyarmnn-33.1.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())" -'33.0.0' +'33.1.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())" -'33.0.0' +'33.1.0' ``` # PyArmNN API overview diff --git a/python/pyarmnn/examples/image_classification/README.md b/python/pyarmnn/examples/image_classification/README.md index 7eafc11c6b..fbdec4f2aa 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())" -'33.0.0' +'33.1.0' ``` ##### Dependencies diff --git a/python/pyarmnn/examples/keyword_spotting/README.md b/python/pyarmnn/examples/keyword_spotting/README.md index 66611092ee..f08959eb25 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())" -'33.0.0' +'33.1.0' ``` ### Dependencies diff --git a/python/pyarmnn/examples/object_detection/README.md b/python/pyarmnn/examples/object_detection/README.md index 991f97d8ab..5835bff264 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())" -'33.0.0' +'33.1.0' ``` ##### Dependencies diff --git a/python/pyarmnn/examples/speech_recognition/README.md b/python/pyarmnn/examples/speech_recognition/README.md index b50a7b3608..59c417c447 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())" -'33.0.0' +'33.1.0' ``` ### Dependencies diff --git a/python/pyarmnn/src/pyarmnn/_version.py b/python/pyarmnn/src/pyarmnn/_version.py index 075f92e7ba..43078f5bc1 100644 --- a/python/pyarmnn/src/pyarmnn/_version.py +++ b/python/pyarmnn/src/pyarmnn/_version.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT import os -version_info = (33, 0, 0) +version_info = (33, 1, 0) __dev_version_env = os.getenv("PYARMNN_DEV_VER", "") @@ -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. 33.0.0) + installed_armnn_version (str): Arm NN version used to generate the package (e.g. 33.1.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 4de2acf96c..9bb3b6e1ba 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('33.0.0', '33.0.0') + check_armnn_version('33.1.0', '33.1.0') def test_incorrect_armnn_version(): with pytest.raises(AssertionError) as err: - check_armnn_version('32.1.0', '33.0.0') + check_armnn_version('32.1.0', '33.1.0') - assert 'Expected ArmNN version is 33.0.0 but installed ArmNN version is 32.1.0' in str(err.value) + assert 'Expected ArmNN version is 33.1.0 but installed ArmNN version is 32.1.0' in str(err.value) def test_armnn_version_patch_does_not_matter(): - check_armnn_version('33.0.0', '33.0.0') + check_armnn_version('33.1.0', '33.1.0') diff --git a/python/pyarmnn/test/test_version.py b/python/pyarmnn/test/test_version.py index d4d9becd08..2d9d65bf56 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 "33.0.0.dev1" == v.__version__ + assert "33.1.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 "33.0.0" == v.__arm_ml_version__ + assert "33.1.0" == v.__arm_ml_version__ del os.environ["PYARMNN_DEV_VER"] del v -- cgit v1.2.1