From 1edac31473f554851dafe6462e7bb0db8990a9fe Mon Sep 17 00:00:00 2001 From: Patryk Kaiser Date: Mon, 4 Nov 2024 13:46:58 +0000 Subject: [PATCH] IVGCVSW-8476: Update release versions for 24.11 Signed-off-by: Patryk Kaiser Change-Id: I028874be658fd6f1b203e55e38c528d78b99bc5e --- delegate/classic/include/Version.hpp | 4 ++-- delegate/opaque/include/Version.hpp | 4 ++-- include/armnn/Version.hpp | 4 ++-- include/armnnTfLiteParser/Version.hpp | 4 ++-- python/pyarmnn/README.md | 8 ++++---- python/pyarmnn/examples/object_detection/README.md | 2 +- python/pyarmnn/src/pyarmnn/_version.py | 2 +- python/pyarmnn/test/test_setup.py | 8 ++++---- python/pyarmnn/test/test_version.py | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/delegate/classic/include/Version.hpp b/delegate/classic/include/Version.hpp index 56683167f..f9eb55e91 100644 --- a/delegate/classic/include/Version.hpp +++ b/delegate/classic/include/Version.hpp @@ -14,8 +14,8 @@ namespace armnnDelegate // ArmNN Delegate version components #define DELEGATE_MAJOR_VERSION 29 -#define DELEGATE_MINOR_VERSION 0 -#define DELEGATE_PATCH_VERSION 1 +#define DELEGATE_MINOR_VERSION 1 +#define DELEGATE_PATCH_VERSION 0 /// DELEGATE_VERSION: "X.Y.Z" /// where: diff --git a/delegate/opaque/include/Version.hpp b/delegate/opaque/include/Version.hpp index 6f88a30bf..4320feb6a 100644 --- a/delegate/opaque/include/Version.hpp +++ b/delegate/opaque/include/Version.hpp @@ -14,8 +14,8 @@ namespace armnnOpaqueDelegate // ArmNN Delegate version components #define OPAQUE_DELEGATE_MAJOR_VERSION 2 -#define OPAQUE_DELEGATE_MINOR_VERSION 0 -#define OPAQUE_DELEGATE_PATCH_VERSION 1 +#define OPAQUE_DELEGATE_MINOR_VERSION 1 +#define OPAQUE_DELEGATE_PATCH_VERSION 0 /// DELEGATE_VERSION: "X.Y.Z" /// where: diff --git a/include/armnn/Version.hpp b/include/armnn/Version.hpp index 1e5226b34..72593fe39 100644 --- a/include/armnn/Version.hpp +++ b/include/armnn/Version.hpp @@ -10,8 +10,8 @@ #define STRINGIFY_MACRO(s) #s // ArmNN version components -#define ARMNN_MAJOR_VERSION 33 -#define ARMNN_MINOR_VERSION 2 +#define ARMNN_MAJOR_VERSION 34 +#define ARMNN_MINOR_VERSION 0 #define ARMNN_PATCH_VERSION 0 /// ARMNN_VERSION: "X.Y.Z" diff --git a/include/armnnTfLiteParser/Version.hpp b/include/armnnTfLiteParser/Version.hpp index 35eb84443..e31d87502 100644 --- a/include/armnnTfLiteParser/Version.hpp +++ b/include/armnnTfLiteParser/Version.hpp @@ -14,8 +14,8 @@ namespace armnnTfLiteParser // TfLiteParser version components #define TFLITE_PARSER_MAJOR_VERSION 24 -#define TFLITE_PARSER_MINOR_VERSION 6 -#define TFLITE_PARSER_PATCH_VERSION 1 +#define TFLITE_PARSER_MINOR_VERSION 7 +#define TFLITE_PARSER_PATCH_VERSION 0 /// TFLITE_PARSER_VERSION: "X.Y.Z" /// where: diff --git a/python/pyarmnn/README.md b/python/pyarmnn/README.md index 48418f1b5..e6e590830 100644 --- a/python/pyarmnn/README.md +++ b/python/pyarmnn/README.md @@ -70,8 +70,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.2.0-cp36-cp36m-*linux_x86_64*.whl -* Linux Aarch 64 bit machine: pyarmnn-33.2.0-cp36-cp36m-*linux_aarch64*.whl +* Linux x86 64bit machine: pyarmnn-34.0.0-cp36-cp36m-*linux_x86_64*.whl +* Linux Aarch 64 bit machine: pyarmnn-34.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. @@ -111,7 +111,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.2.0' +'34.0.0' ``` @@ -149,7 +149,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.2.0' +'34.0.0' ``` # PyArmNN API overview diff --git a/python/pyarmnn/examples/object_detection/README.md b/python/pyarmnn/examples/object_detection/README.md index 4735e498c..39b496b45 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.2.0' +'34.0.0' ``` ##### Dependencies diff --git a/python/pyarmnn/src/pyarmnn/_version.py b/python/pyarmnn/src/pyarmnn/_version.py index 4f20f69a2..db261b239 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, 2, 0) +version_info = (34, 0, 0) __dev_version_env = os.getenv("PYARMNN_DEV_VER", "") diff --git a/python/pyarmnn/test/test_setup.py b/python/pyarmnn/test/test_setup.py index 8d6af43da..80d28eaae 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.2.0', '33.2.0') + check_armnn_version('34.0.0', '34.0.0') def test_incorrect_armnn_version(): with pytest.raises(AssertionError) as err: - check_armnn_version('32.1.0', '33.2.0') + check_armnn_version('32.1.0', '34.0.0') - assert 'Expected ArmNN version is 33.2.0 but installed ArmNN version is 32.1.0' in str(err.value) + assert 'Expected ArmNN version is 34.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('33.2.0', '33.2.0') + check_armnn_version('34.0.0', '34.0.0') diff --git a/python/pyarmnn/test/test_version.py b/python/pyarmnn/test/test_version.py index 5872cbfa1..d965bb37b 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.2.0.dev1" == v.__version__ + assert "34.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 "33.2.0" == v.__arm_ml_version__ + assert "34.0.0" == v.__arm_ml_version__ del os.environ["PYARMNN_DEV_VER"] del v