Skip to content

Commit

Permalink
IVGCVSW-8476: Update release versions for 24.11
Browse files Browse the repository at this point in the history
Signed-off-by: Patryk Kaiser <[email protected]>
Change-Id: I028874be658fd6f1b203e55e38c528d78b99bc5e
  • Loading branch information
patryk-kaiser-ARM authored and CianMcGriskinARM committed Nov 6, 2024
1 parent da6597f commit 1edac31
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions delegate/classic/include/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions delegate/opaque/include/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions include/armnn/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions include/armnnTfLiteParser/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions python/pyarmnn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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'
```


Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/pyarmnn/examples/object_detection/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/pyarmnn/src/pyarmnn/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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", "")

Expand Down
8 changes: 4 additions & 4 deletions python/pyarmnn/test/test_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
4 changes: 2 additions & 2 deletions python/pyarmnn/test/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 1edac31

Please sign in to comment.